diff mbox

[FFmpeg-devel,2/3] lavif/opencl: Avoid deprecation warnings when built with post-1.2 headers

Message ID 20180319230531.7079-2-sw@jkqxz.net
State Accepted
Commit 0568af521ef3eed3e811fb4bebff050b559dbf53
Headers show

Commit Message

Mark Thompson March 19, 2018, 11:05 p.m. UTC 
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.
---
 libavfilter/opencl.h            | 6 ++++++
 libavfilter/vf_overlay_opencl.c | 8 +-------
 libavfilter/vf_program_opencl.c | 6 +-----
 3 files changed, 8 insertions(+), 12 deletions(-)
diff mbox

Patch

diff --git a/libavfilter/opencl.h b/libavfilter/opencl.h
index 45fe2a2e27..c0a4519785 100644
--- a/libavfilter/opencl.h
+++ b/libavfilter/opencl.h
@@ -19,6 +19,12 @@ 
 #ifndef 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/hwcontext.h"
 #include "libavutil/hwcontext_opencl.h"
diff --git a/libavfilter/vf_overlay_opencl.c b/libavfilter/vf_overlay_opencl.c
index 16e10f4371..b43050df58 100644
--- a/libavfilter/vf_overlay_opencl.c
+++ b/libavfilter/vf_overlay_opencl.c
@@ -16,16 +16,10 @@ 
  * 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/mathematics.h"
 #include "libavutil/mem.h"
-#include "libavutil/pixdesc.h"
 #include "libavutil/opt.h"
+#include "libavutil/pixdesc.h"
 
 #include "avfilter.h"
 #include "framesync.h"
diff --git a/libavfilter/vf_program_opencl.c b/libavfilter/vf_program_opencl.c
index 0bcf188ac7..a0027923fb 100644
--- a/libavfilter/vf_program_opencl.c
+++ b/libavfilter/vf_program_opencl.c
@@ -17,14 +17,10 @@ 
  */
 
 #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/mem.h"
-#include "libavutil/pixdesc.h"
 #include "libavutil/opt.h"
+#include "libavutil/pixdesc.h"
 
 #include "avfilter.h"
 #include "framesync.h"