[FFmpeg-cvslog] pthread: dont autoenable frame threads with visualization

Michael Niedermayer git at videolan.org
Sun Jan 1 03:52:32 CET 2012


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Jan  1 02:54:31 2012 +0100| [57581e41103ccc77db42a3bc62078f726db40416] | committer: Michael Niedermayer

pthread: dont autoenable frame threads with visualization

This combination doesnt work

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=57581e41103ccc77db42a3bc62078f726db40416
---

 libavcodec/pthread.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/libavcodec/pthread.c b/libavcodec/pthread.c
index 1144011..cdf3a39 100644
--- a/libavcodec/pthread.c
+++ b/libavcodec/pthread.c
@@ -781,6 +781,8 @@ static int frame_thread_init(AVCodecContext *avctx)
 
     if (!thread_count) {
         int nb_cpus = get_logical_cpus(avctx);
+        if ((avctx->debug & (FF_DEBUG_VIS_QP | FF_DEBUG_VIS_MB_TYPE)) || avctx->debug_mv)
+            nb_cpus = 1;
         // use number of cores + 1 as thread count if there is motre than one
         if (nb_cpus > 1)
             thread_count = avctx->thread_count = nb_cpus + 1;



More information about the ffmpeg-cvslog mailing list