lavu: rename ff_opencl_set_parameter() to avpriv_opencl_set_parameter()

It was wrongly being exported and used by libavfilter.

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

diff --git a/libavfilter/deshake_opencl.c b/libavfilter/deshake_opencl.c
index c66103cb7b8fe8a3103219fdacf02e4070f90e5d..2821248218ae0488bd2c0233309f87981006dc0a 100644 (file)
--- a/libavfilter/deshake_opencl.c
+++ b/libavfilter/deshake_opencl.c
@@ -57,7 +57,7 @@ int ff_opencl_transform(AVFilterContext *ctx,
         av_log(ctx, AV_LOG_ERROR, "Selected interpolate method is invalid\n");
         return AVERROR(EINVAL);
     }
-    ret = ff_opencl_set_parameter(&param_lu,
+    ret = avpriv_opencl_set_parameter(&param_lu,
                                   FF_OPENCL_PARAM_INFO(deshake->opencl_ctx.cl_inbuf),
                                   FF_OPENCL_PARAM_INFO(deshake->opencl_ctx.cl_outbuf),
                                   FF_OPENCL_PARAM_INFO(packed_matrix_lu),
@@ -70,7 +70,7 @@ int ff_opencl_transform(AVFilterContext *ctx,
                                   NULL);
     if (ret < 0)
         return ret;
-    ret = ff_opencl_set_parameter(&param_ch,
+    ret = avpriv_opencl_set_parameter(&param_ch,
                                   FF_OPENCL_PARAM_INFO(deshake->opencl_ctx.cl_inbuf),
                                   FF_OPENCL_PARAM_INFO(deshake->opencl_ctx.cl_outbuf),
                                   FF_OPENCL_PARAM_INFO(packed_matrix_ch),

diff --git a/libavfilter/unsharp_opencl.c b/libavfilter/unsharp_opencl.c
index e619cefdedb4d40e56764bfaf10a5cd47db2375c..5c6b5ef5cb1b6f8f3a0cacf3fbea4dbe90ab8e2d 100644 (file)
--- a/libavfilter/unsharp_opencl.c
+++ b/libavfilter/unsharp_opencl.c
@@ -181,7 +181,7 @@ int ff_opencl_apply_unsharp(AVFilterContext *ctx, AVFrame *in, AVFrame *out)
 
         kernel1.ctx = ctx;
         kernel1.kernel = unsharp->opencl_ctx.kernel_luma;
-        ret = ff_opencl_set_parameter(&kernel1,
+        ret = avpriv_opencl_set_parameter(&kernel1,
                                       FF_OPENCL_PARAM_INFO(unsharp->opencl_ctx.cl_inbuf),
                                       FF_OPENCL_PARAM_INFO(unsharp->opencl_ctx.cl_outbuf),
                                       FF_OPENCL_PARAM_INFO(unsharp->opencl_ctx.cl_luma_mask),
@@ -198,7 +198,7 @@ int ff_opencl_apply_unsharp(AVFilterContext *ctx, AVFrame *in, AVFrame *out)
 
         kernel2.ctx = ctx;
         kernel2.kernel = unsharp->opencl_ctx.kernel_chroma;
-        ret = ff_opencl_set_parameter(&kernel2,
+        ret = avpriv_opencl_set_parameter(&kernel2,
                                       FF_OPENCL_PARAM_INFO(unsharp->opencl_ctx.cl_inbuf),
                                       FF_OPENCL_PARAM_INFO(unsharp->opencl_ctx.cl_outbuf),
                                       FF_OPENCL_PARAM_INFO(unsharp->opencl_ctx.cl_chroma_mask),
@@ -230,7 +230,7 @@ int ff_opencl_apply_unsharp(AVFilterContext *ctx, AVFrame *in, AVFrame *out)
         kernel1.ctx = ctx;
         kernel1.kernel = unsharp->opencl_ctx.kernel_default;
 
-        ret = ff_opencl_set_parameter(&kernel1,
+        ret = avpriv_opencl_set_parameter(&kernel1,
                                       FF_OPENCL_PARAM_INFO(unsharp->opencl_ctx.cl_inbuf),
                                       FF_OPENCL_PARAM_INFO(unsharp->opencl_ctx.cl_outbuf),
                                       FF_OPENCL_PARAM_INFO(unsharp->opencl_ctx.cl_luma_mask),

diff --git a/libavutil/opencl_internal.c b/libavutil/opencl_internal.c
index 3d996ab006ade7b8369e486181f3fced143254b3..bdb41936faf496eb97a5f15c9ca620a8dc912648 100644 (file)
--- a/libavutil/opencl_internal.c
+++ b/libavutil/opencl_internal.c
@@ -23,7 +23,7 @@
 #include "opencl_internal.h"
 #include "libavutil/log.h"
 
-int ff_opencl_set_parameter(FFOpenclParam *opencl_param, ...)
+int avpriv_opencl_set_parameter(FFOpenclParam *opencl_param, ...)
 {
     int ret = 0;
     va_list arg_ptr;

diff --git a/libavutil/opencl_internal.h b/libavutil/opencl_internal.h
index 34b39a0d6b833ffff4050778e7e0bb3f01087f41..dacd930ac9b47e7a89a50755c74aeb0de754c9ac 100644 (file)
--- a/libavutil/opencl_internal.h
+++ b/libavutil/opencl_internal.h
@@ -30,4 +30,4 @@ typedef struct {
     void *ctx;
 } FFOpenclParam;
 
-int ff_opencl_set_parameter(FFOpenclParam *opencl_param, ...);
+int avpriv_opencl_set_parameter(FFOpenclParam *opencl_param, ...);