| author | Thilo Borgmann <thilo.borgmann@mail.de> | 2013-10-01 14:49:39 (GMT) |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-01 16:31:21 (GMT) |
| commit | d3a03d90a3d57cdc6f915a05f5f28ee4bb470d00 (patch) | |
| tree | 60877f319ff22d6f9455dcb8abeb296c1d98cdb7 | |
| parent | 2e2a2d8801b045b3dd58a4e49e8e040b559bc84a (diff) | |
| download | ffmpeg-d3a03d90a3d57cdc6f915a05f5f28ee4bb470d00.zip ffmpeg-d3a03d90a3d57cdc6f915a05f5f28ee4bb470d00.tar.gz ffmpeg-d3a03d90a3d57cdc6f915a05f5f28ee4bb470d00.tar.bz2 | |
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>
| -rwxr-xr-x | configure | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -4286,7 +4286,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)" || |