diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-01-01 02:54:31 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-01-01 02:54:31 +0100 |
| commit | 57581e41103ccc77db42a3bc62078f726db40416 (patch) | |
| tree | 1e1246a2fdb4abd526afebf3d2a1c40ad1811194 | |
| parent | e404eee1e1eb81900170e8f10db1328520ed97ae (diff) | |
| download | ffmpeg-57581e41103ccc77db42a3bc62078f726db40416.tar.gz | |
pthread: dont autoenable frame threads with visualization
This combination doesnt work
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/pthread.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/pthread.c b/libavcodec/pthread.c index 1144011a91..cdf3a391cc 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; |