From f7459bcfc5b54554f95616214696b2a9d189d7fa Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sat, 15 Feb 2014 15:14:46 +0100 Subject: [PATCH] avcodec/frame_thread_encoder: restructure huffyuv checks This makes them similar to the other checks Signed-off-by: Michael Niedermayer --- libavcodec/frame_thread_encoder.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/libavcodec/frame_thread_encoder.c b/libavcodec/frame_thread_encoder.c index 786599679d..05a7c6b43f 100644 --- a/libavcodec/frame_thread_encoder.c +++ b/libavcodec/frame_thread_encoder.c @@ -139,6 +139,15 @@ int ff_frame_thread_encoder_init(AVCodecContext *avctx, AVDictionary *options){ av_log(avctx, AV_LOG_WARNING, "MJPEG CBR encoding works badly with frame multi-threading, consider " "using -threads 1, -thread_type slice or a constant quantizer.\n"); + + if (avctx->codec_id == AV_CODEC_ID_HUFFYUV || + avctx->codec_id == AV_CODEC_ID_FFVHUFF) { + // huffyuv doesnt support these with multiple frame threads currently + if (avctx->context_model > 0 || (avctx->flags & CODEC_FLAG_PASS1)) { + avctx->thread_count = 1; + } + } + if(!avctx->thread_count) { avctx->thread_count = av_cpu_count(); avctx->thread_count = FFMIN(avctx->thread_count, MAX_THREADS); @@ -147,13 +156,6 @@ int ff_frame_thread_encoder_init(AVCodecContext *avctx, AVDictionary *options){ if(avctx->thread_count <= 1) return 0; - if (avctx->codec_id == AV_CODEC_ID_HUFFYUV || - avctx->codec_id == AV_CODEC_ID_FFVHUFF) { - // huffyuv doesnt support these with multiple frame threads currently - if (avctx->context_model > 0 || (avctx->flags & CODEC_FLAG_PASS1)) - return 0; - } - if(avctx->thread_count > MAX_THREADS) return AVERROR(EINVAL);