diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2012-01-03 05:25:56 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-01-03 06:06:45 +0400 |
commit | 7d8f1158436c261d2d1657c33e731f9bec650c51 (patch) | |
tree | cf3c0261ba5202ad949af637a026b11dc4631a00 /tests | |
parent | 45552371e3434fb7aa4d0bc566fd4ef954f9af14 (diff) | |
parent | 881a5e047dc78ec9ab771817497dffec503d77ee (diff) |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
mpegenc: use avctx->slices as number of slices
v410enc: fix undefined signed left shift caused by integer promotion
Release notes: mention cleaned up header includes
fix Changelog file
Fix a bunch of typos.
Drop some pointless void* return value casts from av_malloc() invocations.
wavpack: fix typos in previous cosmetic clean-up commit
wavpack: cosmetics: K&R pretty-printing
avconv: remove the 'codec framerate is different from stream' warning
wavpack: determine sample_fmt before requesting a buffer
bmv audio: implement new audio decoding API
mpegaudiodec: skip all channels when skipping granules
mpegenc: simplify muxrate calculation
Conflicts:
Changelog
avconv.c
doc/RELEASE_NOTES
libavcodec/h264.c
libavcodec/mpeg12.c
libavcodec/mpegaudiodec.c
libavcodec/mpegvideo.c
libavformat/mpegenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests')
-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 491e032bf7..f3ead20298 100755 --- a/tests/codec-regression.sh +++ b/tests/codec-regression.sh @@ -62,13 +62,13 @@ fi if [ -n "$do_mpeg2thread" ] ; then # mpeg2 encoding interlaced -do_video_encoding mpeg2thread.mpg "-qscale 10 -vcodec mpeg2video -f mpeg1video -bf 2 -flags +ildct+ilme -threads 2" +do_video_encoding mpeg2thread.mpg "-qscale 10 -vcodec mpeg2video -f mpeg1video -bf 2 -flags +ildct+ilme -threads 2 -slices 2" do_video_decoding fi if [ -n "$do_mpeg2thread_ilace" ]; then # mpeg2 encoding interlaced using intra vlc -do_video_encoding mpeg2threadivlc.mpg "-qscale 10 -vcodec mpeg2video -f mpeg1video -bf 2 -flags +ildct+ilme -flags2 +ivlc -threads 2" +do_video_encoding mpeg2threadivlc.mpg "-qscale 10 -vcodec mpeg2video -f mpeg1video -bf 2 -flags +ildct+ilme -flags2 +ivlc -threads 2 -slices 2" do_video_decoding # mpeg2 encoding interlaced @@ -158,7 +158,7 @@ do_video_decoding fi if [ -n "$do_mpeg4thread" ] ; then -do_video_encoding mpeg4-thread.avi "-b 500k -flags +mv4+part+aic -trellis 1 -mbd bits -ps 200 -bf 2 -an -vcodec mpeg4 -threads 2" +do_video_encoding mpeg4-thread.avi "-b 500k -flags +mv4+part+aic -trellis 1 -mbd bits -ps 200 -bf 2 -an -vcodec mpeg4 -threads 2 -slices 2" do_video_decoding fi |