mirror of https://git.ffmpeg.org/ffmpeg.git
lavfi/opencl: Avoid deprecation warnings when built with post-1.2 headers
The intended target is OpenCL 1.2, so disable warnings for APIs deprecated after that. This primarily applies to clCreateCommandQueue(), we can't use the replacement clCreateCommandQueueWithProperties() because it was introduced in OpenCL 2.0. Also remove some unnecessary includes from overlay and program filters so that the define is available at the right moment.
This commit is contained in:
parent
2a1542d105
commit
0568af521e
|
@ -19,6 +19,12 @@
|
||||||
#ifndef AVFILTER_OPENCL_H
|
#ifndef AVFILTER_OPENCL_H
|
||||||
#define AVFILTER_OPENCL_H
|
#define AVFILTER_OPENCL_H
|
||||||
|
|
||||||
|
// The intended target is OpenCL 1.2, so disable warnings for APIs
|
||||||
|
// deprecated after that. This primarily applies to clCreateCommandQueue(),
|
||||||
|
// we can't use the replacement clCreateCommandQueueWithProperties() because
|
||||||
|
// it was introduced in OpenCL 2.0.
|
||||||
|
#define CL_USE_DEPRECATED_OPENCL_1_2_APIS
|
||||||
|
|
||||||
#include "libavutil/buffer.h"
|
#include "libavutil/buffer.h"
|
||||||
#include "libavutil/hwcontext.h"
|
#include "libavutil/hwcontext.h"
|
||||||
#include "libavutil/hwcontext_opencl.h"
|
#include "libavutil/hwcontext_opencl.h"
|
||||||
|
|
|
@ -16,16 +16,10 @@
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "libavutil/avassert.h"
|
|
||||||
#include "libavutil/buffer.h"
|
|
||||||
#include "libavutil/common.h"
|
|
||||||
#include "libavutil/hwcontext.h"
|
|
||||||
#include "libavutil/hwcontext_opencl.h"
|
|
||||||
#include "libavutil/log.h"
|
#include "libavutil/log.h"
|
||||||
#include "libavutil/mathematics.h"
|
|
||||||
#include "libavutil/mem.h"
|
#include "libavutil/mem.h"
|
||||||
#include "libavutil/pixdesc.h"
|
|
||||||
#include "libavutil/opt.h"
|
#include "libavutil/opt.h"
|
||||||
|
#include "libavutil/pixdesc.h"
|
||||||
|
|
||||||
#include "avfilter.h"
|
#include "avfilter.h"
|
||||||
#include "framesync.h"
|
#include "framesync.h"
|
||||||
|
|
|
@ -17,14 +17,10 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "libavutil/avstring.h"
|
#include "libavutil/avstring.h"
|
||||||
#include "libavutil/buffer.h"
|
|
||||||
#include "libavutil/common.h"
|
|
||||||
#include "libavutil/hwcontext.h"
|
|
||||||
#include "libavutil/hwcontext_opencl.h"
|
|
||||||
#include "libavutil/log.h"
|
#include "libavutil/log.h"
|
||||||
#include "libavutil/mem.h"
|
#include "libavutil/mem.h"
|
||||||
#include "libavutil/pixdesc.h"
|
|
||||||
#include "libavutil/opt.h"
|
#include "libavutil/opt.h"
|
||||||
|
#include "libavutil/pixdesc.h"
|
||||||
|
|
||||||
#include "avfilter.h"
|
#include "avfilter.h"
|
||||||
#include "framesync.h"
|
#include "framesync.h"
|
||||||
|
|
Loading…
Reference in New Issue