From d69a4177b988cadaaadcd349f4b5dc1abe784a2d Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Wed, 13 Mar 2013 08:26:39 +0100 Subject: lavfi: remove now unused args parameter from AVFilter.init Conflicts: libavfilter/avfilter.c libavfilter/vf_drawtext.c libavfilter/vf_lut.c libavfilter/vf_select.c libavfilter/vf_setpts.c libavfilter/vsrc_color.c libavfilter/vsrc_movie.c Signed-off-by: Michael Niedermayer --- libavfilter/vf_lut.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'libavfilter/vf_lut.c') diff --git a/libavfilter/vf_lut.c b/libavfilter/vf_lut.c index 2824f03b09..1f0b684b75 100644 --- a/libavfilter/vf_lut.c +++ b/libavfilter/vf_lut.c @@ -354,7 +354,7 @@ static const AVFilterPad outputs[] = { #define lut_options options AVFILTER_DEFINE_CLASS(lut); -static int lut_init(AVFilterContext *ctx, const char *args) +static int lut_init(AVFilterContext *ctx) { return 0; } @@ -367,7 +367,7 @@ DEFINE_LUT_FILTER(lut, "Compute and apply a lookup table to the RGB/YUV input vi #define lutyuv_options options AVFILTER_DEFINE_CLASS(lutyuv); -static int lutyuv_init(AVFilterContext *ctx, const char *args) +static int lutyuv_init(AVFilterContext *ctx) { LutContext *lut = ctx->priv; @@ -384,7 +384,7 @@ DEFINE_LUT_FILTER(lutyuv, "Compute and apply a lookup table to the YUV input vid #define lutrgb_options options AVFILTER_DEFINE_CLASS(lutrgb); -static int lutrgb_init(AVFilterContext *ctx, const char *args) +static int lutrgb_init(AVFilterContext *ctx) { LutContext *lut = ctx->priv; @@ -405,7 +405,7 @@ static const AVOption negate_options[] = { AVFILTER_DEFINE_CLASS(negate); -static int negate_init(AVFilterContext *ctx, const char *args) +static int negate_init(AVFilterContext *ctx) { LutContext *lut = ctx->priv; int i; @@ -421,7 +421,7 @@ static int negate_init(AVFilterContext *ctx, const char *args) } } - return lut_init(ctx, NULL); + return lut_init(ctx); } DEFINE_LUT_FILTER(negate, "Negate input video."); -- cgit v1.2.3