From e1cb6dc59ec26a9cfe2d8f95a72e78d123b19e3b Mon Sep 17 00:00:00 2001
From: Carl Eugen Hoyos <cehoyos@ag.or.at>
Date: Thu, 30 Jan 2014 00:55:35 +0100
Subject: [PATCH] Warn the user if mjpeg cbr encoding with frame threading was
requested.
---
libavcodec/frame_thread_encoder.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/libavcodec/frame_thread_encoder.c b/libavcodec/frame_thread_encoder.c
index a9c14235026..786599679de 100644
--- a/libavcodec/frame_thread_encoder.c
+++ b/libavcodec/frame_thread_encoder.c
@@ -133,6 +133,12 @@ int ff_frame_thread_encoder_init(AVCodecContext *avctx, AVDictionary *options){
"or a constant quantizer if you want to use multiple cpu cores\n");
avctx->thread_count = 1;
}
+ if( avctx->thread_count > 1
+ && avctx->codec_id == AV_CODEC_ID_MJPEG
+ && !(avctx->flags & CODEC_FLAG_QSCALE))
+ 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->thread_count) {
avctx->thread_count = av_cpu_count();
avctx->thread_count = FFMIN(avctx->thread_count, MAX_THREADS);
--
GitLab