From f7813a5324be39d13ab536c245d15dfc602a7849 Mon Sep 17 00:00:00 2001 From: Tim Redfern Date: Sun, 29 Dec 2013 12:19:38 +0000 Subject: basic type mechanism working --- ffmpeg/libavcodec/frame_thread_encoder.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'ffmpeg/libavcodec/frame_thread_encoder.c') diff --git a/ffmpeg/libavcodec/frame_thread_encoder.c b/ffmpeg/libavcodec/frame_thread_encoder.c index b11a54a..b9acefc 100644 --- a/ffmpeg/libavcodec/frame_thread_encoder.c +++ b/ffmpeg/libavcodec/frame_thread_encoder.c @@ -30,9 +30,9 @@ #if HAVE_PTHREADS #include #elif HAVE_W32THREADS -#include "w32pthreads.h" +#include "compat/w32pthreads.h" #elif HAVE_OS2THREADS -#include "os2threads.h" +#include "compat/os2threads.h" #endif #define MAX_THREADS 64 @@ -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); } -- cgit v1.2.3