Merge commit 'f53490cc0c809975f8238d5a9edbd26f83bd2f84'

[ffmpeg] / libavcodec / mpeg12enc.c

diff --git a/libavcodec/mpeg12enc.c b/libavcodec/mpeg12enc.c
index cda1464c8633fca3a6cb3463c250c836d641528b..f2b5c05f0ddd54170dccb910efb7d70ce65e8e47 100644 (file)
--- a/libavcodec/mpeg12enc.c
+++ b/libavcodec/mpeg12enc.c
@@ -145,6 +145,9 @@ static av_cold int encode_init(AVCodecContext *avctx)
 {
     MpegEncContext *s = avctx->priv_data;
 
+    if (avctx->codec_id == AV_CODEC_ID_MPEG1VIDEO && avctx->height > 2800)
+        avctx->thread_count = 1;
+
     if(ff_MPV_encode_init(avctx) < 0)
         return -1;