diff options
| author | Anton Khirnov <anton@khirnov.net> | 2011-08-09 13:56:36 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2011-08-16 06:20:43 +0200 |
| commit | 64db1a82d663958593f66ff7bf351d6a670e51a4 (patch) | |
| tree | e209ab3b098935cfb00c135211904ea878e45a58 /tests | |
| parent | f4ad238c6c696f021e53eae8f255c2d1b79fefbb (diff) | |
| download | ffmpeg-64db1a82d663958593f66ff7bf351d6a670e51a4.tar.gz | |
lavc: add audio flag to the 'b' option, deprecate 'ab'.
Its only reason for its existence was ffmpeg's inability to properly assign
AVOptions to streams. Now this is not a problem anymore, so 'ab' should
go.
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/codec-regression.sh | 4 | ||||
| -rwxr-xr-x | tests/lavf-regression.sh | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/tests/codec-regression.sh b/tests/codec-regression.sh index 902e37d1d2..708509c29d 100755 --- a/tests/codec-regression.sh +++ b/tests/codec-regression.sh @@ -16,7 +16,7 @@ if [ -n "$do_vref" ]; then do_avconv $raw_ref -f image2 -vcodec pgmyuv -i $raw_src -an -f rawvideo fi if [ -n "$do_aref" ]; then -do_avconv $pcm_ref -ab 128k -ac 2 -ar 44100 -f s16le -i $pcm_src -f wav +do_avconv $pcm_ref -b 128k -ac 2 -ar 44100 -f s16le -i $pcm_src -f wav fi if [ -n "$do_mpeg" ] ; then @@ -279,7 +279,7 @@ do_audio_encoding ac3.rm "-vn -acodec ac3_fixed" fi if [ -n "$do_g726" ] ; then -do_audio_encoding g726.wav "-ab 32k -ac 1 -ar 8000 -acodec g726" +do_audio_encoding g726.wav "-b 32k -ac 1 -ar 8000 -acodec g726" do_audio_decoding fi diff --git a/tests/lavf-regression.sh b/tests/lavf-regression.sh index 3650ce1b95..bb7a497979 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_avconv $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_avconv $file $DEC_OPTS -f image2 -vcodec pgmyuv -i $raw_src $DEC_OPTS -ar 44100 -f s16le -i $pcm_src $ENC_OPTS -b:a 64k -t 1 -qscale 10 $2 do_avconv_crc $file $DEC_OPTS -i $target_path/$file $3 } @@ -53,7 +53,7 @@ fi if [ -n "$do_rm" ] ; then file=${outfile}lavf.rm -do_avconv $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_avconv $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 -b:a 64k # broken #do_avconv_crc $file -i $target_path/$file fi |