[FFmpeg-cvslog] configure: fix logic for threads in case of OpenCL is enabled.

Thilo Borgmann git at videolan.org
Thu Oct 3 00:56:18 CEST 2013


ffmpeg | branch: release/2.0 | Thilo Borgmann <thilo.borgmann at mail.de> | Tue Oct  1 16:49:39 2013 +0200| [842d7c9b3af0ea6327bbc8b4554f5fa35f3b73ac] | committer: Carl Eugen Hoyos

configure: fix logic for threads in case of OpenCL is enabled.

Fixes ticket 3004.

Signed-off-by: Thilo Borgmann <thilo.borgmann at mail.de>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit d3a03d90a3d57cdc6f915a05f5f28ee4bb470d00)

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=842d7c9b3af0ea6327bbc8b4554f5fa35f3b73ac
---

 configure |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure b/configure
index 54e46c8..03954a4 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)" ||



More information about the ffmpeg-cvslog mailing list