Commit c43a7eca authored by Anton Khirnov's avatar Anton Khirnov

lavfi: remove now unused args parameter from AVFilter.init

parent 7b3eb745
...@@ -94,7 +94,7 @@ static int get_sample_rate(const char *samplerate) ...@@ -94,7 +94,7 @@ static int get_sample_rate(const char *samplerate)
return FFMAX(ret, 0); return FFMAX(ret, 0);
} }
static av_cold int init(AVFilterContext *ctx, const char *args) static av_cold int init(AVFilterContext *ctx)
{ {
AFormatContext *s = ctx->priv; AFormatContext *s = ctx->priv;
......
...@@ -488,7 +488,7 @@ fail: ...@@ -488,7 +488,7 @@ fail:
return ret; return ret;
} }
static int init(AVFilterContext *ctx, const char *args) static int init(AVFilterContext *ctx)
{ {
MixContext *s = ctx->priv; MixContext *s = ctx->priv;
int i; int i;
......
...@@ -64,7 +64,7 @@ static const AVClass async_class = { ...@@ -64,7 +64,7 @@ static const AVClass async_class = {
.version = LIBAVUTIL_VERSION_INT, .version = LIBAVUTIL_VERSION_INT,
}; };
static int init(AVFilterContext *ctx, const char *args) static int init(AVFilterContext *ctx)
{ {
ASyncContext *s = ctx->priv; ASyncContext *s = ctx->priv;
......
...@@ -119,7 +119,7 @@ static int get_channel(char **map, uint64_t *ch, char delim) ...@@ -119,7 +119,7 @@ static int get_channel(char **map, uint64_t *ch, char delim)
return 0; return 0;
} }
static av_cold int channelmap_init(AVFilterContext *ctx, const char *args) static av_cold int channelmap_init(AVFilterContext *ctx)
{ {
ChannelMapContext *s = ctx->priv; ChannelMapContext *s = ctx->priv;
int ret; int ret;
......
...@@ -53,7 +53,7 @@ static const AVClass channelsplit_class = { ...@@ -53,7 +53,7 @@ static const AVClass channelsplit_class = {
.version = LIBAVUTIL_VERSION_INT, .version = LIBAVUTIL_VERSION_INT,
}; };
static int init(AVFilterContext *ctx, const char *arg) static int init(AVFilterContext *ctx)
{ {
ChannelSplitContext *s = ctx->priv; ChannelSplitContext *s = ctx->priv;
int nb_channels; int nb_channels;
......
...@@ -186,7 +186,7 @@ static int parse_maps(AVFilterContext *ctx) ...@@ -186,7 +186,7 @@ static int parse_maps(AVFilterContext *ctx)
return 0; return 0;
} }
static int join_init(AVFilterContext *ctx, const char *args) static int join_init(AVFilterContext *ctx)
{ {
JoinContext *s = ctx->priv; JoinContext *s = ctx->priv;
int ret, i; int ret, i;
......
...@@ -60,7 +60,7 @@ static const AVClass volume_class = { ...@@ -60,7 +60,7 @@ static const AVClass volume_class = {
.version = LIBAVUTIL_VERSION_INT, .version = LIBAVUTIL_VERSION_INT,
}; };
static av_cold int init(AVFilterContext *ctx, const char *args) static av_cold int init(AVFilterContext *ctx)
{ {
VolumeContext *vol = ctx->priv; VolumeContext *vol = ctx->priv;
......
...@@ -578,7 +578,7 @@ int avfilter_init_filter(AVFilterContext *filter, const char *args, void *opaque ...@@ -578,7 +578,7 @@ int avfilter_init_filter(AVFilterContext *filter, const char *args, void *opaque
} }
if (filter->filter->init) if (filter->filter->init)
ret = filter->filter->init(filter, args); ret = filter->filter->init(filter);
else if (filter->filter->init_dict) else if (filter->filter->init_dict)
ret = filter->filter->init_dict(filter, &options); ret = filter->filter->init_dict(filter, &options);
if (ret < 0) if (ret < 0)
......
...@@ -403,10 +403,10 @@ typedef struct AVFilter { ...@@ -403,10 +403,10 @@ typedef struct AVFilter {
*/ */
/** /**
* Filter initialization function. Args contains the user-supplied * Filter initialization function. Called when all the options have been
* parameters. FIXME: maybe an AVOption-based system would be better? * set.
*/ */
int (*init)(AVFilterContext *ctx, const char *args); int (*init)(AVFilterContext *ctx);
/** /**
* Should be set instead of init by the filters that want to pass a * Should be set instead of init by the filters that want to pass a
......
...@@ -236,7 +236,7 @@ fail: ...@@ -236,7 +236,7 @@ fail:
} }
#endif #endif
static av_cold int init_video(AVFilterContext *ctx, const char *args) static av_cold int init_video(AVFilterContext *ctx)
{ {
BufferSourceContext *c = ctx->priv; BufferSourceContext *c = ctx->priv;
...@@ -304,7 +304,7 @@ static const AVClass abuffer_class = { ...@@ -304,7 +304,7 @@ static const AVClass abuffer_class = {
.version = LIBAVUTIL_VERSION_INT, .version = LIBAVUTIL_VERSION_INT,
}; };
static av_cold int init_audio(AVFilterContext *ctx, const char *args) static av_cold int init_audio(AVFilterContext *ctx)
{ {
BufferSourceContext *s = ctx->priv; BufferSourceContext *s = ctx->priv;
int ret = 0; int ret = 0;
......
...@@ -51,7 +51,7 @@ typedef struct { ...@@ -51,7 +51,7 @@ typedef struct {
int allocated_samples; ///< number of samples out was allocated for int allocated_samples; ///< number of samples out was allocated for
} FifoContext; } FifoContext;
static av_cold int init(AVFilterContext *ctx, const char *args) static av_cold int init(AVFilterContext *ctx)
{ {
FifoContext *fifo = ctx->priv; FifoContext *fifo = ctx->priv;
fifo->last = &fifo->root; fifo->last = &fifo->root;
......
...@@ -39,7 +39,7 @@ typedef struct SplitContext { ...@@ -39,7 +39,7 @@ typedef struct SplitContext {
int nb_outputs; int nb_outputs;
} SplitContext; } SplitContext;
static int split_init(AVFilterContext *ctx, const char *args) static int split_init(AVFilterContext *ctx)
{ {
SplitContext *s = ctx->priv; SplitContext *s = ctx->priv;
int i; int i;
......
...@@ -42,7 +42,7 @@ typedef struct { ...@@ -42,7 +42,7 @@ typedef struct {
} AspectContext; } AspectContext;
#if FF_API_OLD_FILTER_OPTS #if FF_API_OLD_FILTER_OPTS
static av_cold int init(AVFilterContext *ctx, const char *args) static av_cold int init(AVFilterContext *ctx)
{ {
AspectContext *s = ctx->priv; AspectContext *s = ctx->priv;
......
...@@ -80,7 +80,7 @@ typedef struct { ...@@ -80,7 +80,7 @@ typedef struct {
#define V 2 #define V 2
#define A 3 #define A 3
static av_cold int init(AVFilterContext *ctx, const char *args) static av_cold int init(AVFilterContext *ctx)
{ {
BoxBlurContext *boxblur = ctx->priv; BoxBlurContext *boxblur = ctx->priv;
......
...@@ -86,7 +86,7 @@ static int checkline(void *ctx, const unsigned char *src, int stride, int len, i ...@@ -86,7 +86,7 @@ static int checkline(void *ctx, const unsigned char *src, int stride, int len, i
return total; return total;
} }
static av_cold int init(AVFilterContext *ctx, const char *args) static av_cold int init(AVFilterContext *ctx)
{ {
CropDetectContext *cd = ctx->priv; CropDetectContext *cd = ctx->priv;
......
...@@ -173,7 +173,7 @@ static int query_formats(AVFilterContext *ctx) ...@@ -173,7 +173,7 @@ static int query_formats(AVFilterContext *ctx)
return 0; return 0;
} }
static av_cold int init(AVFilterContext *ctx, const char *args) static av_cold int init(AVFilterContext *ctx)
{ {
DelogoContext *delogo = ctx->priv; DelogoContext *delogo = ctx->priv;
......
...@@ -44,7 +44,7 @@ typedef struct { ...@@ -44,7 +44,7 @@ typedef struct {
int vsub, hsub; ///< chroma subsampling int vsub, hsub; ///< chroma subsampling
} DrawBoxContext; } DrawBoxContext;
static av_cold int init(AVFilterContext *ctx, const char *args) static av_cold int init(AVFilterContext *ctx)
{ {
DrawBoxContext *drawbox= ctx->priv; DrawBoxContext *drawbox= ctx->priv;
uint8_t rgba_color[4]; uint8_t rgba_color[4];
......
...@@ -280,7 +280,7 @@ error: ...@@ -280,7 +280,7 @@ error:
return ret; return ret;
} }
static av_cold int init(AVFilterContext *ctx, const char *args) static av_cold int init(AVFilterContext *ctx)
{ {
int err; int err;
DrawTextContext *dtext = ctx->priv; DrawTextContext *dtext = ctx->priv;
......
...@@ -45,7 +45,7 @@ typedef struct { ...@@ -45,7 +45,7 @@ typedef struct {
int hsub, vsub, bpp; int hsub, vsub, bpp;
} FadeContext; } FadeContext;
static av_cold int init(AVFilterContext *ctx, const char *args) static av_cold int init(AVFilterContext *ctx)
{ {
FadeContext *fade = ctx->priv; FadeContext *fade = ctx->priv;
......
...@@ -47,7 +47,7 @@ typedef struct { ...@@ -47,7 +47,7 @@ typedef struct {
#define AV_PIX_FMT_NAME_MAXSIZE 32 #define AV_PIX_FMT_NAME_MAXSIZE 32
static av_cold int init(AVFilterContext *ctx, const char *args) static av_cold int init(AVFilterContext *ctx)
{ {
FormatContext *format = ctx->priv; FormatContext *format = ctx->priv;
const char *cur, *sep; const char *cur, *sep;
......
...@@ -64,7 +64,7 @@ static const AVClass class = { ...@@ -64,7 +64,7 @@ static const AVClass class = {
.version = LIBAVUTIL_VERSION_INT, .version = LIBAVUTIL_VERSION_INT,
}; };
static av_cold int init(AVFilterContext *ctx, const char *args) static av_cold int init(AVFilterContext *ctx)
{ {
FPSContext *s = ctx->priv; FPSContext *s = ctx->priv;
int ret; int ret;
......
...@@ -295,7 +295,7 @@ static av_cold int frei0r_init(AVFilterContext *ctx, ...@@ -295,7 +295,7 @@ static av_cold int frei0r_init(AVFilterContext *ctx,
return 0; return 0;
} }
static av_cold int filter_init(AVFilterContext *ctx, const char *args) static av_cold int filter_init(AVFilterContext *ctx)
{ {
Frei0rContext *frei0r = ctx->priv; Frei0rContext *frei0r = ctx->priv;
...@@ -421,7 +421,7 @@ AVFilter avfilter_vf_frei0r = { ...@@ -421,7 +421,7 @@ AVFilter avfilter_vf_frei0r = {
.outputs = avfilter_vf_frei0r_outputs, .outputs = avfilter_vf_frei0r_outputs,
}; };
static av_cold int source_init(AVFilterContext *ctx, const char *args) static av_cold int source_init(AVFilterContext *ctx)
{ {
Frei0rContext *frei0r = ctx->priv; Frei0rContext *frei0r = ctx->priv;
AVRational frame_rate_q; AVRational frame_rate_q;
......
...@@ -120,7 +120,7 @@ static void filter(GradFunContext *ctx, uint8_t *dst, uint8_t *src, int width, i ...@@ -120,7 +120,7 @@ static void filter(GradFunContext *ctx, uint8_t *dst, uint8_t *src, int width, i
} }
} }
static av_cold int init(AVFilterContext *ctx, const char *args) static av_cold int init(AVFilterContext *ctx)
{ {
GradFunContext *gf = ctx->priv; GradFunContext *gf = ctx->priv;
......
...@@ -181,7 +181,7 @@ static int16_t *precalc_coefs(double dist25, int depth) ...@@ -181,7 +181,7 @@ static int16_t *precalc_coefs(double dist25, int depth)
#define PARAM2_DEFAULT 3.0 #define PARAM2_DEFAULT 3.0
#define PARAM3_DEFAULT 6.0 #define PARAM3_DEFAULT 6.0
static int init(AVFilterContext *ctx, const char *args) static int init(AVFilterContext *ctx)
{ {
HQDN3DContext *hqdn3d = ctx->priv; HQDN3DContext *hqdn3d = ctx->priv;
......
...@@ -317,7 +317,7 @@ static OCVFilterEntry ocv_filter_entries[] = { ...@@ -317,7 +317,7 @@ static OCVFilterEntry ocv_filter_entries[] = {
{ "smooth", sizeof(SmoothContext), smooth_init, NULL, smooth_end_frame_filter }, { "smooth", sizeof(SmoothContext), smooth_init, NULL, smooth_end_frame_filter },
}; };
static av_cold int init(AVFilterContext *ctx, const char *args) static av_cold int init(AVFilterContext *ctx)
{ {
OCVContext *ocv = ctx->priv; OCVContext *ocv = ctx->priv;
int i; int i;
......
...@@ -101,7 +101,7 @@ static const AVOption lut_options[] = { ...@@ -101,7 +101,7 @@ static const AVOption lut_options[] = {
{ NULL }, { NULL },
}; };
static int init(AVFilterContext *ctx, const char *args) static int init(AVFilterContext *ctx)
{ {
LutContext *lut = ctx->priv; LutContext *lut = ctx->priv;
...@@ -385,7 +385,7 @@ static const AVOption negate_options[] = { ...@@ -385,7 +385,7 @@ static const AVOption negate_options[] = {
{ NULL }, { NULL },
}; };
static int negate_init(AVFilterContext *ctx, const char *args) static int negate_init(AVFilterContext *ctx)
{ {
LutContext *lut = ctx->priv; LutContext *lut = ctx->priv;
int i; int i;
...@@ -401,7 +401,7 @@ static int negate_init(AVFilterContext *ctx, const char *args) ...@@ -401,7 +401,7 @@ static int negate_init(AVFilterContext *ctx, const char *args)
} }
} }
return init(ctx, NULL); return init(ctx);
} }
DEFINE_LUT_FILTER(negate, "Negate input video.", negate_init, negate_options); DEFINE_LUT_FILTER(negate, "Negate input video.", negate_init, negate_options);
......
...@@ -112,7 +112,7 @@ typedef struct { ...@@ -112,7 +112,7 @@ typedef struct {
int hsub, vsub; ///< chroma subsampling values int hsub, vsub; ///< chroma subsampling values
} PadContext; } PadContext;
static av_cold int init(AVFilterContext *ctx, const char *args) static av_cold int init(AVFilterContext *ctx)
{ {
PadContext *pad = ctx->priv; PadContext *pad = ctx->priv;
......
...@@ -89,7 +89,7 @@ typedef struct { ...@@ -89,7 +89,7 @@ typedef struct {
char *flags_str; char *flags_str;
} ScaleContext; } ScaleContext;
static av_cold int init(AVFilterContext *ctx, const char *args) static av_cold int init(AVFilterContext *ctx)
{ {
ScaleContext *scale = ctx->priv; ScaleContext *scale = ctx->priv;
......
...@@ -125,7 +125,7 @@ typedef struct { ...@@ -125,7 +125,7 @@ typedef struct {
AVFifoBuffer *pending_frames; ///< FIFO buffer of video frames AVFifoBuffer *pending_frames; ///< FIFO buffer of video frames
} SelectContext; } SelectContext;
static av_cold int init(AVFilterContext *ctx, const char *args) static av_cold int init(AVFilterContext *ctx)
{ {
SelectContext *select = ctx->priv; SelectContext *select = ctx->priv;
int ret; int ret;
......
...@@ -74,7 +74,7 @@ typedef struct { ...@@ -74,7 +74,7 @@ typedef struct {
double var_values[VAR_VARS_NB]; double var_values[VAR_VARS_NB];
} SetPTSContext; } SetPTSContext;
static av_cold int init(AVFilterContext *ctx, const char *args) static av_cold int init(AVFilterContext *ctx)
{ {
SetPTSContext *setpts = ctx->priv; SetPTSContext *setpts = ctx->priv;
int ret; int ret;
......
...@@ -136,7 +136,7 @@ static void set_filter_param(FilterParam *fp, int msize_x, int msize_y, float am ...@@ -136,7 +136,7 @@ static void set_filter_param(FilterParam *fp, int msize_x, int msize_y, float am
fp->halfscale = 1 << (fp->scalebits - 1); fp->halfscale = 1 << (fp->scalebits - 1);
} }
static av_cold int init(AVFilterContext *ctx, const char *args) static av_cold int init(AVFilterContext *ctx)
{ {
UnsharpContext *unsharp = ctx->priv; UnsharpContext *unsharp = ctx->priv;
......
...@@ -54,7 +54,7 @@ typedef struct { ...@@ -54,7 +54,7 @@ typedef struct {
char *framerate_str; char *framerate_str;
} ColorContext; } ColorContext;
static av_cold int color_init(AVFilterContext *ctx, const char *args) static av_cold int color_init(AVFilterContext *ctx)
{ {
ColorContext *color = ctx->priv; ColorContext *color = ctx->priv;
AVRational frame_rate_q; AVRational frame_rate_q;
......
...@@ -160,7 +160,7 @@ static int movie_init(AVFilterContext *ctx) ...@@ -160,7 +160,7 @@ static int movie_init(AVFilterContext *ctx)
return 0; return 0;
} }
static av_cold int init(AVFilterContext *ctx, const char *args) static av_cold int init(AVFilterContext *ctx)
{ {
MovieContext *movie = ctx->priv; MovieContext *movie = ctx->priv;
......
...@@ -328,7 +328,7 @@ static void test_fill_picture(AVFilterContext *ctx, AVFrame *frame) ...@@ -328,7 +328,7 @@ static void test_fill_picture(AVFilterContext *ctx, AVFrame *frame)
} }
} }
static av_cold int test_init(AVFilterContext *ctx, const char *args) static av_cold int test_init(AVFilterContext *ctx)
{ {
TestSourceContext *test = ctx->priv; TestSourceContext *test = ctx->priv;
...@@ -440,7 +440,7 @@ static void rgbtest_fill_picture(AVFilterContext *ctx, AVFrame *frame) ...@@ -440,7 +440,7 @@ static void rgbtest_fill_picture(AVFilterContext *ctx, AVFrame *frame)
} }
} }
static av_cold int rgbtest_init(AVFilterContext *ctx, const char *args) static av_cold int rgbtest_init(AVFilterContext *ctx)
{ {
TestSourceContext *test = ctx->priv; TestSourceContext *test = ctx->priv;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment