webmaster-use-ffmpeg.diff

diff --git a/tools/WebMaster b/tools/WebMaster
index 9203c99..be59850 100755
--- a/tools/WebMaster
+++ b/tools/WebMaster
@@ -208,8 +208,7 @@ do
     then
        mv $vf $of
     else
-       mkvmerge $vf $af -o $of || [[ -f $of ]]  # mkvmerge doesn't return succeful exit code,
-                                                # so checking for result existence instead
+       ffmpeg -i $vf -i $af -map 0:v -map 1:a -c copy -strict -2 -y $of
     fi
     if [[ ! -z $preview ]]
     then