diff options
| author | James Almer <jamrial@gmail.com> | 2015-01-12 13:48:52 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2015-02-14 02:21:19 -0300 |
| commit | 3c63503792147a996997023694a3b45f27ab3f78 (patch) | |
| tree | 22a03af965f19205856fe250e23870c54c391159 | |
| parent | a78b7c504a7b5e0a40507f281d70a0e153071f51 (diff) | |
| download | ffmpeg-3c63503792147a996997023694a3b45f27ab3f78.tar.gz | |
avutil/opencl: don't include config.hn2.4.7
It's not an installed header.
Tested-by: Thilo Borgmann <thilo.borgmann@mail.de>
Tested-by: Wei Gao <highgod0401@gmail.com>
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
(cherry picked from commit 3aaff803489af21011b8cf03847e17b29643c922)
| -rwxr-xr-x | configure | 2 | ||||
| -rw-r--r-- | libavutil/opencl.h | 7 |
2 files changed, 3 insertions, 6 deletions
@@ -1620,7 +1620,6 @@ HEADERS_LIST=" asm_types_h cdio_paranoia_h cdio_paranoia_paranoia_h - CL_cl_h dev_bktr_ioctl_bt848_h dev_bktr_ioctl_meteor_h dev_ic_bt8xx_h @@ -4710,7 +4709,6 @@ check_func_headers glob.h glob enabled xlib && check_func_headers "X11/Xlib.h X11/extensions/Xvlib.h" XvGetPortAttribute -lXv -lX11 -lXext -check_header cl/cl.h check_header direct.h check_header dlfcn.h check_header dxva.h diff --git a/libavutil/opencl.h b/libavutil/opencl.h index 9e6dc55ee8..8c1dfeb037 100644 --- a/libavutil/opencl.h +++ b/libavutil/opencl.h @@ -32,11 +32,10 @@ #ifndef LIBAVUTIL_OPENCL_H #define LIBAVUTIL_OPENCL_H -#include "config.h" -#if HAVE_CL_CL_H -#include <CL/cl.h> -#else +#ifdef __APPLE__ #include <OpenCL/cl.h> +#else +#include <CL/cl.h> #endif #include <stdint.h> #include "dict.h" |