diff options
| author | James Almer <jamrial@gmail.com> | 2014-08-11 16:35:39 -0300 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-12 03:49:45 +0200 |
| commit | 744f15b6b3801dc008e767be0846bad55b62444f (patch) | |
| tree | 9939007040229f575a5d2b5ecdd5fda876f00843 | |
| parent | 9f617a14a00805ffd54dee4fce34e3e4099d21f3 (diff) | |
| download | ffmpeg-744f15b6b3801dc008e767be0846bad55b62444f.tar.gz | |
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>
| -rw-r--r-- | libavfilter/deshake_opencl.c | 4 | ||||
| -rw-r--r-- | libavfilter/unsharp_opencl.c | 6 | ||||
| -rw-r--r-- | libavutil/opencl_internal.c | 2 | ||||
| -rw-r--r-- | libavutil/opencl_internal.h | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/libavfilter/deshake_opencl.c b/libavfilter/deshake_opencl.c index c66103cb7b..2821248218 100644 --- 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(¶m_lu, + ret = avpriv_opencl_set_parameter(¶m_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(¶m_ch, + ret = avpriv_opencl_set_parameter(¶m_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 e619cefded..5c6b5ef5cb 100644 --- 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 3d996ab006..bdb41936fa 100644 --- 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 34b39a0d6b..dacd930ac9 100644 --- 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, ...); |