virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

avutil/opencl: don't include config.h

Browse Source 
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>
This commit is contained in:
James Almer 2015-01-12 13:48:52 -03:00
parent 365ef88d5d
commit 3aaff80348
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure vendored
View File

@ -1642,7 +1642,6 @@ HEADERS_LIST="
asm_types_h asm_types_h
cdio_paranoia_h cdio_paranoia_h
cdio_paranoia_paranoia_h cdio_paranoia_paranoia_h
CL_cl_h
dev_bktr_ioctl_bt848_h dev_bktr_ioctl_bt848_h
dev_bktr_ioctl_meteor_h dev_bktr_ioctl_meteor_h
dev_ic_bt8xx_h dev_ic_bt8xx_h
@ -4775,7 +4774,6 @@ check_func_headers glob.h glob
enabled xlib && enabled xlib &&
check_func_headers "X11/Xlib.h X11/extensions/Xvlib.h" XvGetPortAttribute -lXv -lX11 -lXext 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 direct.h
check_header dlfcn.h check_header dlfcn.h
check_header dxva.h check_header dxva.h

7
libavutil/opencl.h
View File

@ -32,11 +32,10 @@
#ifndef LIBAVUTIL_OPENCL_H #ifndef LIBAVUTIL_OPENCL_H
#define LIBAVUTIL_OPENCL_H #define LIBAVUTIL_OPENCL_H
#include "config.h" #ifdef __APPLE__
#if HAVE_CL_CL_H
#include <CL/cl.h>
#else
#include <OpenCL/cl.h> #include <OpenCL/cl.h>
#else
#include <CL/cl.h>
#endif #endif
#include <stdint.h> #include <stdint.h>
#include "dict.h" #include "dict.h"