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

[James Almer]

On 06/01/15 11:27 PM, Michael Niedermayer wrote:
> On Tue, Jan 06, 2015 at 01:56:01AM -0300, James Almer wrote:
>> It's not an installed header. Use libavutil/avconfig.h instead.
> 
> assuming noone objects to this "hack" ... ugly but it should fix the
> build so ok

Yes, i agree it's kinda ugly. What about this instead?

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"

That's the exact check the OpenCL headers themselves do.