generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

threads: check defines before using them in automatic thread detection

Browse Source
This commit is contained in:
Janne Grunau 2011-12-23 11:10:37 +01:00
parent 846dca1aa3
commit 7052618c7e
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/pthread.c
View File

@ -152,7 +152,7 @@ typedef struct FrameThreadContext {
static int get_logical_cpus(AVCodecContext *avctx) static int get_logical_cpus(AVCodecContext *avctx)
{ {
int ret, nb_cpus = 1; int ret, nb_cpus = 1;
#if HAVE_SCHED_GETAFFINITY #if HAVE_SCHED_GETAFFINITY && defined(CPU_COUNT)
cpu_set_t cpuset; cpu_set_t cpuset;
CPU_ZERO(&cpuset); CPU_ZERO(&cpuset);
@ -165,7 +165,7 @@ static int get_logical_cpus(AVCodecContext *avctx)
SYSTEM_INFO sysinfo; SYSTEM_INFO sysinfo;
GetSystemInfo(&sysinfo); GetSystemInfo(&sysinfo);
nb_cpus = sysinfo.dwNumberOfProcessors; nb_cpus = sysinfo.dwNumberOfProcessors;
#elif HAVE_SYSCTL #elif HAVE_SYSCTL && defined(HW_NCPU)
int mib[2] = { CTL_HW, HW_NCPU }; int mib[2] = { CTL_HW, HW_NCPU };
size_t len = sizeof(nb_cpus); size_t len = sizeof(nb_cpus);