[FFmpeg-cvslog] avutil/opencl: don't include config.h

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Mon Jan 12 13:48:52 2015 -0300| [3aaff803489af21011b8cf03847e17b29643c922] | committer: James Almer

avutil/opencl: don't include config.h

It's not an installed header.

Tested-by: Thilo Borgmann <thilo.borgmann at mail.de>
Tested-by: Wei Gao <highgod0401 at gmail.com>
Reviewed-by: Michael Niedermayer <michaelni at gmx.at>
Signed-off-by: James Almer <jamrial at gmail.com>

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

 configure          |    2 --
 libavutil/opencl.h |    7 +++----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/configure b/configure
index 94f9432..a0dbafb 100755
--- a/configure
+++ b/configure
@@ -1642,7 +1642,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
@@ -4775,7 +4774,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 4655cba..0b7b8d4 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"