From: Oleg Broytman Date: Tue, 4 Nov 2014 00:22:44 +0000 (+0300) Subject: Specify an output file; remove fixed AVI format X-Git-Url: https://git.phdru.name/?a=commitdiff_plain;h=99b2740dabc2164f36f5acfdccd2234b352136ab;p=audio-cdr-video.git Specify an output file; remove fixed AVI format Output format will be determined by the output file's extension. --- diff --git a/video/ff_encode b/video/ff_encode index 990e5c3..c838f97 100755 --- a/video/ff_encode +++ b/video/ff_encode @@ -1,7 +1,7 @@ #! /bin/sh if [ -z "$1" ]; then - echo "Usage: [vcodec=s] [vbitrate=n] [vscale=s] [aid=n] [acodec=s] [abitrate=n] [ascale=s] [pass=n] [input_opts=input_opts] [output_opts=output_opts] $0 input.avi" + echo "Usage: [vcodec=s] [vbitrate=n] [vscale=s] [aid=n] [acodec=s] [abitrate=n] [ascale=s] [pass=n] [input_opts=input_opts] [output_opts=output_opts] $0 input [output]" exit 1 fi @@ -32,17 +32,24 @@ fi input="$1" shift +if [ -n "$1" ]; then + output="$1" + shift +else + output=output.avi +fi + if [ "$vcodec" = mpeg4-hq ]; then vcodec=mpeg4 vopts="-mbd rd -flags +mv4+aic -trellis 2 -cmp 2 -subcmp 2" fi if [ "$pass" -eq 1 ]; then - exec ffmpeg $input_opts -i "$input" -f avi -c:v "$vcodec" $vopts $vscale -b:v "$vbitrate" -g 300 -bf 2 -c:a "$acodec" -b:a "$abitrate" $output_opts output.avi + 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" elif [ "$pass" -eq 2 ]; then - ffmpeg -pass 1 $input_opts -i "$input" -f avi -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" -f avi -c:v "$vcodec" $vopts $vscale -b:v "$vbitrate" -g 300 -bf 2 -c:a "$acodec" -b:a "$abitrate" $output_opts output.avi + 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" else echo "Can only do 1 or 2 passes." >&2