From e404eee1e1eb81900170e8f10db1328520ed97ae Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sun, 1 Jan 2012 01:21:31 +0100 Subject: [PATCH] pthread: Limit automatic threads to mb_height. Signed-off-by: Michael Niedermayer --- libavcodec/pthread.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavcodec/pthread.c b/libavcodec/pthread.c index a338dbedef..1144011a91 100644 --- a/libavcodec/pthread.c +++ b/libavcodec/pthread.c @@ -189,6 +189,10 @@ static int get_logical_cpus(AVCodecContext *avctx) nb_cpus = sysconf(_SC_NPROCESSORS_ONLN); #endif av_log(avctx, AV_LOG_DEBUG, "detected %d logical cores\n", nb_cpus); + + if (avctx->height) + nb_cpus = FFMIN(nb_cpus, (avctx->height+15)/16); + return FFMIN(nb_cpus, MAX_AUTO_THREADS); }