summaryrefslogtreecommitdiff
path: root/ffmpeg/libavcodec/frame_thread_encoder.c
diff options
context:
space:
mode:
Diffstat (limited to 'ffmpeg/libavcodec/frame_thread_encoder.c')
-rw-r--r--ffmpeg/libavcodec/frame_thread_encoder.c6
1 files changed, 3 insertions, 3 deletions
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 <pthread.h>
#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);
}