summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorMark Thompson <sw@jkqxz.net>2019-03-26 23:39:19 +0000
committerMark Thompson <sw@jkqxz.net>2019-03-27 22:29:23 +0000
commitd0b174d7df886023b2ce64d229d3af4777c01587 (patch)
treef1be573fc9acdf9ffcddc3bc433b34b6faa5d0a5 /configure
parent6bc800dead1e5717bd673bbf04ef23107bf7238f (diff)
downloadffmpeg-streaming-d0b174d7df886023b2ce64d229d3af4777c01587.zip
ffmpeg-streaming-d0b174d7df886023b2ce64d229d3af4777c01587.tar.gz
configure: Do not enable both OpenCL-VAAPI interop modes simultaneously
Beignet offers a far more flexiable and complete interface, so choose it by default if available.
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure9
1 files changed, 6 insertions, 3 deletions
diff --git a/configure b/configure
index 331393f..c94f516 100755
--- a/configure
+++ b/configure
@@ -6471,9 +6471,12 @@ if enabled_all opencl libdrm ; then
fi
if enabled_all opencl vaapi ; then
- enabled opencl_drm_beignet && enable opencl_vaapi_beignet
- check_type "CL/cl.h CL/cl_va_api_media_sharing_intel.h" "clCreateFromVA_APIMediaSurfaceINTEL_fn" &&
- enable opencl_vaapi_intel_media
+ if enabled opencl_drm_beignet ; then
+ enable opencl_vaapi_beignet
+ else
+ check_type "CL/cl.h CL/cl_va_api_media_sharing_intel.h" "clCreateFromVA_APIMediaSurfaceINTEL_fn" &&
+ enable opencl_vaapi_intel_media
+ fi
fi
if enabled_all opencl dxva2 ; then
OpenPOWER on IntegriCloud