diff options
author | Janne Grunau <janne-libav@jannau.net> | 2012-01-01 23:24:24 +0400 |
---|---|---|
committer | Janne Grunau <janne-libav@jannau.net> | 2012-01-02 22:20:23 +0400 |
commit | 881a5e047dc78ec9ab771817497dffec503d77ee (patch) | |
tree | 0857c45d86537a7efe7c54dcbbe6b2d956b32861 /tests | |
parent | 264808219d8be93aeda0b6ade8c64898b673f6bc (diff) |
mpegenc: use avctx->slices as number of slices
Adds a new member to MpegEncContext to hold the number of used slice
contexts. Fixes segfaults with '-threads 17 -thread_type slice' and
fate-vsynth{1,2}-mpeg{2,4}thread{,_ilace} with --disable-pthreads.
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 e20bf6420d..220593b17f 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 fi @@ -143,7 +143,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 |