diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-12 19:52:46 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-12 20:12:11 +0100 |
| commit | a01679586cd9ac8470b81c0299fc7e13fd980d64 (patch) | |
| tree | fa4c8e2b0709332f12982eeb9e262222d3777e1a /libavcodec/mpegvideo_enc.c | |
| parent | 03df9720168335482f00898fc16b56ff4878d0e7 (diff) | |
| download | ffmpeg-a01679586cd9ac8470b81c0299fc7e13fd980d64.tar.gz | |
mpeg1video: fix regression with slices != threads
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpegvideo_enc.c')
| -rw-r--r-- | libavcodec/mpegvideo_enc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index 200c01472c..3379090855 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) |