Move MPEG-specific parameters to vopts

diff --git a/video/ff_encode b/video/ff_encode
index 275417cf0688a4470a2d03b9927fc6feaa3cbcc9..baef86223e2f75a80c5d00b5c89e76162bc047d1 100755 (executable)
--- a/video/ff_encode
+++ b/video/ff_encode
@@ -39,9 +39,13 @@ else
    output=output.avi
 fi
 
+if [ "$vcodec" = mpeg4 ]; then
+   vopts="-g 300 -bf 2"
+fi
+
 if [ "$vcodec" = mpeg4-hq ]; then
    vcodec=mpeg4
-   vopts="-mbd rd -flags +mv4+aic -trellis 2 -cmp 2 -subcmp 2"
+   vopts="-g 300 -bf 2 -mbd rd -flags +mv4+aic -trellis 2 -cmp 2 -subcmp 2"
 fi
 
 if [ "$vcodec" = x264 ]; then
@@ -59,11 +63,11 @@ if [ "$vcodec" = x264-vhq ]; then
 fi
 
 if [ "$pass" -eq 1 ]; then
-   exec ffmpeg $input_opts -i "$input" -c:v "$vcodec" $vopts $vscale -b:v "$vbitrate" -g 300 -bf 2 -c:a "$acodec" -b:a "$abitrate" $output_opts "$output"
+   exec ffmpeg $input_opts -i "$input" -c:v "$vcodec" $vopts $vscale -b:v "$vbitrate" -c:a "$acodec" -b:a "$abitrate" $output_opts "$output"
 
 elif [ "$pass" -eq 2 ]; then
-   ffmpeg -pass 1 $input_opts -i "$input" -c:v "$vcodec" $vopts $vscale -b:v "$vbitrate" -g 300 -bf 2 -an -f rawvideo -y /dev/null $output_opts &&
-   exec ffmpeg -pass 2 $input_opts -i "$input" -c:v "$vcodec" $vopts $vscale -b:v "$vbitrate" -g 300 -bf 2 -c:a "$acodec" -b:a "$abitrate" $output_opts "$output"
+   ffmpeg -pass 1 $input_opts -i "$input" -c:v "$vcodec" $vopts $vscale -b:v "$vbitrate" -an -f rawvideo -y /dev/null $output_opts &&
+   exec ffmpeg -pass 2 $input_opts -i "$input" -c:v "$vcodec" $vopts $vscale -b:v "$vbitrate" -c:a "$acodec" -b:a "$abitrate" $output_opts "$output"
 
 else
    echo "Can only do 1 or 2 passes." >&2