[FFmpeg-cvslog] mpeg1video: fix regression with slices != threads

Michael Niedermayer git at videolan.org
Wed Dec 12 20:50:56 CET 2012


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Dec 12 19:52:46 2012 +0100| [a01679586cd9ac8470b81c0299fc7e13fd980d64] | committer: Michael Niedermayer

mpeg1video: fix regression with slices != threads

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a01679586cd9ac8470b81c0299fc7e13fd980d64
---

 libavcodec/mpegvideo_enc.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c
index 200c014..3379090 100644
--- a/libavcodec/mpegvideo_enc.c
+++ b/libavcodec/mpegvideo_enc.c
@@ -637,7 +637,7 @@ av_cold int ff_MPV_encode_init(AVCodecContext *avctx)
         return -1;
     }
 
-    if (s->avctx->thread_count > 1)
+    if (s->avctx->slices > 1 || s->avctx->thread_count > 1)
         s->rtp_mode = 1;
 
     if (s->avctx->thread_count > 1 && s->codec_id == AV_CODEC_ID_H263P)



More information about the ffmpeg-cvslog mailing list