diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-20 04:14:09 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-20 04:25:52 +0100 |
| commit | ece68a0363ac64c48cc3a66f8c7ad83baac90add (patch) | |
| tree | 971083118e78a64c978cf832bcb33bbe83664f54 | |
| parent | 95f8701c32d8737afe5185e6b2f0fc54d976719f (diff) | |
| download | ffmpeg-ece68a0363ac64c48cc3a66f8c7ad83baac90add.tar.gz | |
mpeg1enc: Disable threads for resolutions too large for multi-threading
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 0c6b0409af070a3bfb02b55fde8ba18219edc76b)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/mpeg12enc.c | 3 |
1 files changed, 3 insertions, 0 deletions
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; |