diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-08-16 23:47:35 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-08-16 23:47:35 +0200 |
| commit | 41bf67d8d4dd02b93df45d7862dbec4536738b5e (patch) | |
| tree | e03e8cad8cab235437cb505937a6138e5371cce0 /tests/codec-regression.sh | |
| parent | 67a8251690a17f05630eb6f45a73db0f0e806c72 (diff) | |
| parent | eb97dbb05a990266b04830ea8e179e0428656b98 (diff) | |
| download | ffmpeg-41bf67d8d4dd02b93df45d7862dbec4536738b5e.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
movenc: change AV_LOG_INFO to AV_LOG_WARNING for some warnings
avconv: remove a write-only variable
avconv: remove pointless parameter from new_*_stream().
avconv: cosmetics, move code
avconv: cosmetics -- move copy_chapters().
avconv: cosmetics -- move parse_forced_key_frames().
lavc: add audio flag to the 'b' option, deprecate 'ab'.
avconv: rename sameq to same_quant
doc/avconv: add forgotten end of chapter.
Changelog: document avconv incompatibilities with ffmpeg.
avconv: replace -vcodec/-acodec/-scodec with a better system.
avconv: remove presets.
svq3: propagate codec memory allocation failure in context init
Conflicts:
Changelog
avconv.c
libavcodec/options.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/codec-regression.sh')
| -rwxr-xr-x | tests/codec-regression.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/codec-regression.sh b/tests/codec-regression.sh index 36461597f5..f7c9d43ee8 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 @@ -58,7 +58,7 @@ do_video_decoding # mpeg2 encoding interlaced file=${outfile}mpeg2reuse.mpg -do_avconv $file $DEC_OPTS -me_threshold 256 -i ${target_path}/${outfile}mpeg2thread.mpg $ENC_OPTS -sameq -me_threshold 256 -mb_threshold 1024 -vcodec mpeg2video -f mpeg1video -bf 2 -flags +ildct+ilme -threads 4 +do_avconv $file $DEC_OPTS -me_threshold 256 -i ${target_path}/${outfile}mpeg2thread.mpg $ENC_OPTS -same_quant -me_threshold 256 -mb_threshold 1024 -vcodec mpeg2video -f mpeg1video -bf 2 -flags +ildct+ilme -threads 4 do_video_decoding fi @@ -294,7 +294,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 |