Browse Source

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>
tags/n2.4
James Almer Michael Niedermayer 11 years ago
parent
commit
744f15b6b3
4 changed files with 7 additions and 7 deletions
  1. +2
    -2
      libavfilter/deshake_opencl.c
  2. +3
    -3
      libavfilter/unsharp_opencl.c
  3. +1
    -1
      libavutil/opencl_internal.c
  4. +1
    -1
      libavutil/opencl_internal.h

+ 2
- 2
libavfilter/deshake_opencl.c View File

@@ -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),


+ 3
- 3
libavfilter/unsharp_opencl.c View File

@@ -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),


+ 1
- 1
libavutil/opencl_internal.c View File

@@ -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;


+ 1
- 1
libavutil/opencl_internal.h View File

@@ -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, ...);

Loading…
Cancel
Save