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

[Michael Niedermayer]

ffmpeg | branch: release/1.0 | Michael Niedermayer <michaelni at gmx.at> | Wed Dec 12 19:52:46 2012 +0100| [553c9c77ccd71a57732fc08c84b185f8e0d82cc7] | committer: Carl Eugen Hoyos

mpeg1video: fix regression with slices != threads

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit a01679586cd9ac8470b81c0299fc7e13fd980d64)

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

 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 ab5f12a..7d7672b 100644
--- a/libavcodec/mpegvideo_enc.c
+++ b/libavcodec/mpegvideo_enc.c
@@ -632,7 +632,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)