From ece68a0363ac64c48cc3a66f8c7ad83baac90add Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sun, 20 Jan 2013 04:14:09 +0100 Subject: [PATCH] mpeg1enc: Disable threads for resolutions too large for multi-threading Signed-off-by: Michael Niedermayer (cherry picked from commit 0c6b0409af070a3bfb02b55fde8ba18219edc76b) Signed-off-by: Michael Niedermayer --- libavcodec/mpeg12enc.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavcodec/mpeg12enc.c b/libavcodec/mpeg12enc.c index 9e31543995..d4606a98cb 100644 --- a/libavcodec/mpeg12enc.c +++ b/libavcodec/mpeg12enc.c @@ -132,6 +132,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;