summaryrefslogtreecommitdiff
path: root/libavcodec/frame_thread_encoder.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-05-24 20:24:29 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-05-24 20:25:53 +0200
commit42bb3e4db672ebb6d8b86e869602a02dcae0f4ca (patch)
tree64e6819464ec5074f847e674662f9b44fb8a197a /libavcodec/frame_thread_encoder.c
parent0cbfbdef4a0701c162569808b8a50ff462e788d8 (diff)
downloadffmpeg-42bb3e4db672ebb6d8b86e869602a02dcae0f4ca.tar.gz
avcodec: remove ff_get_logical_cpus()
This simplifies the code Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/frame_thread_encoder.c')
-rw-r--r--libavcodec/frame_thread_encoder.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/frame_thread_encoder.c b/libavcodec/frame_thread_encoder.c
index 98c50abe3a..80577ec9c4 100644
--- a/libavcodec/frame_thread_encoder.c
+++ b/libavcodec/frame_thread_encoder.c
@@ -126,7 +126,7 @@ int ff_frame_thread_encoder_init(AVCodecContext *avctx, AVDictionary *options){
return 0;
if(!avctx->thread_count) {
- avctx->thread_count = ff_get_logical_cpus(avctx);
+ avctx->thread_count = av_cpu_count();
avctx->thread_count = FFMIN(avctx->thread_count, MAX_THREADS);
}