[FFmpeg-devel] [PATCH] configure: fix opencl related thread type check

Thilo Borgmann thilo.borgmann at mail.de
Tue Oct 1 15:50:15 CEST 2013


Fixes ticket 3004.

-Thilo

-------------- next part --------------
>From 39e7aeb3cc069f111fffe677b61f5d8e07874fe2 Mon Sep 17 00:00:00 2001
From: Thilo Borgmann <thilo.borgmann at mail.de>
Date: Tue, 1 Oct 2013 16:09:24 +0200
Subject: [PATCH] configure: fix logic for threads in case of OpenCL is
 enabled. Fixes ticket 3004.

Signed-off-by: Thilo Borgmann <thilo.borgmann at mail.de>
---
 configure | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/configure b/configure
index f25f7dc..2732f16 100755
--- a/configure
+++ b/configure
@@ -4286,7 +4286,8 @@ 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 &&
+                             { disabled_any w32threads os2threads || 
+                               enabled pthreads ||
                                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)" ||
-- 
1.8.3.2



More information about the ffmpeg-devel mailing list