diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2011-07-11 05:46:51 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2011-07-11 05:46:51 +0200 |
commit | a8c2ff2c3cc5f28c36692031c342692cac742280 (patch) | |
tree | eeca1dd945932eef249114b1cfd830411335dd3a /tests/lavf-regression.sh | |
parent | 3602ad7ee6fe5caa402e61aa04ac695e1c46fe5e (diff) | |
download | ffmpeg-a8c2ff2c3cc5f28c36692031c342692cac742280.tar.gz |
Revert "lavc: remove a half-working attempt at different defaults for audio/video codecs."
This reverts commit 18c007ba37b2c7dee5bd2f1a3eb3bfee9b6b3d26.
Diffstat (limited to 'tests/lavf-regression.sh')
-rwxr-xr-x | tests/lavf-regression.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/lavf-regression.sh b/tests/lavf-regression.sh index 6d2d6d8162..d7e684032c 100755 --- a/tests/lavf-regression.sh +++ b/tests/lavf-regression.sh @@ -14,7 +14,7 @@ eval do_$test=y do_lavf() { file=${outfile}lavf.$1 - do_ffmpeg $file $DEC_OPTS -f image2 -vcodec pgmyuv -i $raw_src $DEC_OPTS -ar 44100 -f s16le -i $pcm_src $ENC_OPTS -ab 64k -t 1 -qscale 10 $2 + do_ffmpeg $file $DEC_OPTS -f image2 -vcodec pgmyuv -i $raw_src $DEC_OPTS -ar 44100 -f s16le -i $pcm_src $ENC_OPTS -t 1 -qscale 10 $2 do_ffmpeg_crc $file $DEC_OPTS -i $target_path/$file $3 } @@ -53,7 +53,7 @@ fi if [ -n "$do_rm" ] ; then file=${outfile}lavf.rm -do_ffmpeg $file $DEC_OPTS -f image2 -vcodec pgmyuv -i $raw_src $DEC_OPTS -ar 44100 -f s16le -i $pcm_src $ENC_OPTS -t 1 -qscale 10 -acodec ac3_fixed -ab 64k +do_ffmpeg $file $DEC_OPTS -f image2 -vcodec pgmyuv -i $raw_src $DEC_OPTS -ar 44100 -f s16le -i $pcm_src $ENC_OPTS -t 1 -qscale 10 -acodec ac3_fixed # broken #do_ffmpeg_crc $file -i $target_path/$file fi |