diff options
| author | Jun Zhao <mypopydev@gmail.com> | 2018-06-02 11:06:50 +0800 |
|---|---|---|
| committer | Jun Zhao <jun.zhao@intel.com> | 2018-06-29 05:17:36 +0800 |
| commit | 2730a0fdf47c6ecbb6029d2b0dc47a27b377bcee (patch) | |
| tree | a652dbb360351d1160d7afee14f39b05ea5a9d70 | |
| parent | 08b1d1d8122517d07f2335437cde0aeedc50143f (diff) | |
| download | ffmpeg-2730a0fdf47c6ecbb6029d2b0dc47a27b377bcee.tar.gz | |
configure: fix check for opencl_vaapi_intel_media.
opencl_vaapi_intel_media doesn't depend on libmfx, OpenCL™ Drivers
and Runtimes for Intel® Architectureis is a standalone release, more
information can be found in the link:
https://software.intel.com/en-us/articles/opencl-drivers.
Signed-off-by: Jun Zhao <mypopydev@gmail.com>
| -rwxr-xr-x | configure | 6 | ||||
| -rw-r--r-- | libavutil/hwcontext_opencl.c | 7 |
2 files changed, 8 insertions, 5 deletions
@@ -6336,10 +6336,8 @@ fi if enabled_all opencl vaapi ; then enabled opencl_drm_beignet && enable opencl_vaapi_beignet - if enabled libmfx ; then - check_type "CL/cl.h CL/va_ext.h" "clCreateFromVA_APIMediaSurfaceINTEL_fn" && - enable opencl_vaapi_intel_media - fi + check_type "CL/cl.h CL/va_ext.h" "clCreateFromVA_APIMediaSurfaceINTEL_fn" && + enable opencl_vaapi_intel_media fi if enabled_all opencl dxva2 ; then diff --git a/libavutil/hwcontext_opencl.c b/libavutil/hwcontext_opencl.c index f2873e15d2..06448c657d 100644 --- a/libavutil/hwcontext_opencl.c +++ b/libavutil/hwcontext_opencl.c @@ -46,7 +46,9 @@ #endif #if HAVE_OPENCL_VAAPI_INTEL_MEDIA +#if CONFIG_LIBMFX #include <mfx/mfxstructures.h> +#endif #include <va/va.h> #include <CL/va_ext.h> #include "hwcontext_vaapi.h" @@ -2245,10 +2247,13 @@ static int opencl_map_from_qsv(AVHWFramesContext *dst_fc, AVFrame *dst, cl_int cle; int err, p; +#if CONFIG_LIBMFX if (src->format == AV_PIX_FMT_QSV) { mfxFrameSurface1 *mfx_surface = (mfxFrameSurface1*)src->data[3]; va_surface = *(VASurfaceID*)mfx_surface->Data.MemId; - } else if (src->format == AV_PIX_FMT_VAAPI) { + } else +#endif + if (src->format == AV_PIX_FMT_VAAPI) { va_surface = (VASurfaceID)(uintptr_t)src->data[3]; } else { return AVERROR(ENOSYS); |