aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThilo Borgmann <thilo.borgmann@mail.de>2013-10-01 16:49:39 +0200
committerCarl Eugen Hoyos <cehoyos@ag.or.at>2013-10-02 23:44:39 +0200
commit842d7c9b3af0ea6327bbc8b4554f5fa35f3b73ac (patch)
tree0dd619a9596e5956f3a74dffb3f43813eafaae27
parent187297b871a3dca9c90dac5aa6cd65f9c8edb240 (diff)
downloadffmpeg-842d7c9b3af0ea6327bbc8b4554f5fa35f3b73ac.tar.gz
configure: fix logic for threads in case of OpenCL is enabled.
Fixes ticket 3004. Signed-off-by: Thilo Borgmann <thilo.borgmann@mail.de> Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit d3a03d90a3d57cdc6f915a05f5f28ee4bb470d00)
-rwxr-xr-xconfigure2
1 files changed, 1 insertions, 1 deletions
diff --git a/configure b/configure
index 54e46c8a7b..03954a4118 100755
--- a/configure
+++ b/configure
@@ -4201,7 +4201,7 @@ enabled openal && { { for al_libs in "${OPENAL_LIBS}" "-lopenal" "-lO
enabled opencl && { check_lib2 OpenCL/cl.h clEnqueueNDRangeKernel -Wl,-framework,OpenCL ||
check_lib2 CL/cl.h clEnqueueNDRangeKernel -lOpenCL ||
die "ERROR: opencl not found"; } &&
- { enabled_any w32threads os2threads &&
+ { ! enabled_any w32threads os2threads ||
die "opencl currently needs --enable-pthreads or --disable-w32threads"; } &&
{ check_cpp_condition "OpenCL/cl.h" "defined(CL_VERSION_1_2)" ||
check_cpp_condition "CL/cl.h" "defined(CL_VERSION_1_2)" ||