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:15:52 +0100 |
| commit | 553c9c77ccd71a57732fc08c84b185f8e0d82cc7 (patch) | |
| tree | f81947c25b73ccac96c98cf8990356b3c62ea5e5 | |
| parent | f44c73f5bbeba178764b801b7b141c494e8753d3 (diff) | |
| download | ffmpeg-553c9c77ccd71a57732fc08c84b185f8e0d82cc7.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 ab5f12a8dc..7d7672b7c4 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) |