diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-12 19:52:46 +0100 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2012-12-13 00:26:08 +0100 |
| commit | cdb376d77507d417be443d60d6dbc3960d5712d7 (patch) | |
| tree | 9d0cd31f2b63fdc3a1a7059fc77d9fcbbab01708 | |
| parent | 6773269f4c84d232aba5818ef012c3a47b2f43c8 (diff) | |
| download | ffmpeg-cdb376d77507d417be443d60d6dbc3960d5712d7.tar.gz | |
mpeg1video: fix regression with slices != threads
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit a01679586cd9ac8470b81c0299fc7e13fd980d64)
| -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 d14374393c..e289663ee7 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -595,7 +595,7 @@ av_cold int 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 (!avctx->time_base.den || !avctx->time_base.num) { |