From 169880e31d627925a3c27c703525da57af74f740 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20B=C5=93sch?= Date: Wed, 10 Apr 2013 23:21:21 +0200 Subject: [PATCH 1/4] lavfi/cellauto: switch to an AVOptions-based system. --- doc/filters.texi | 4 +--- libavfilter/avfilter.c | 1 + libavfilter/vsrc_cellauto.c | 6 ------ 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/doc/filters.texi b/doc/filters.texi index b2d375df5a..5ff34e05ce 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -5813,9 +5813,7 @@ At each new frame a new row in the video is filled with the result of the cellular automaton next generation. The behavior when the whole frame is filled is defined by the @option{scroll} option. -This source accepts a list of options in the form of -@var{key}=@var{value} pairs separated by ":". A description of the -accepted options follows. +This source accepts the following options: @table @option @item filename, f diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index 753567fe81..dbc517e38c 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -660,6 +660,7 @@ int avfilter_init_filter(AVFilterContext *filter, const char *args, void *opaque !strcmp(filter->filter->name, "ass") || !strcmp(filter->filter->name, "blackframe") || !strcmp(filter->filter->name, "boxblur" ) || + !strcmp(filter->filter->name, "cellauto") || !strcmp(filter->filter->name, "colormatrix") || !strcmp(filter->filter->name, "crop" ) || !strcmp(filter->filter->name, "cropdetect") || diff --git a/libavfilter/vsrc_cellauto.c b/libavfilter/vsrc_cellauto.c index a48f04c3e1..3a4917a026 100644 --- a/libavfilter/vsrc_cellauto.c +++ b/libavfilter/vsrc_cellauto.c @@ -164,12 +164,6 @@ static int init(AVFilterContext *ctx, const char *args) CellAutoContext *cellauto = ctx->priv; int ret; - cellauto->class = &cellauto_class; - av_opt_set_defaults(cellauto); - - if ((ret = av_set_options_string(cellauto, args, "=", ":")) < 0) - return ret; - if (!cellauto->w && !cellauto->filename && !cellauto->pattern) av_opt_set(cellauto, "size", "320x518", 0); From bd85fee91481abd98c0adb37784f9acd3c9f1b94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20B=C5=93sch?= Date: Wed, 10 Apr 2013 23:24:05 +0200 Subject: [PATCH 2/4] lavfi/life: switch to an AVOptions-based system. --- doc/filters.texi | 4 +--- libavfilter/avfilter.c | 1 + libavfilter/vsrc_life.c | 6 ------ 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/doc/filters.texi b/doc/filters.texi index 5ff34e05ce..e5d2e8e49d 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -6095,9 +6095,7 @@ which specifies the number of neighbor alive cells which will make a cell stay alive or born. The @option{rule} option allows to specify the rule to adopt. -This source accepts a list of options in the form of -@var{key}=@var{value} pairs separated by ":". A description of the -accepted options follows. +This source accepts the following options: @table @option @item filename, f diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index dbc517e38c..717ba8916c 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -680,6 +680,7 @@ int avfilter_init_filter(AVFilterContext *filter, const char *args, void *opaque !strcmp(filter->filter->name, "gradfun" ) || !strcmp(filter->filter->name, "hqdn3d" ) || !strcmp(filter->filter->name, "ocv" ) || + !strcmp(filter->filter->name, "life" ) || !strcmp(filter->filter->name, "lut" ) || !strcmp(filter->filter->name, "lutyuv" ) || !strcmp(filter->filter->name, "lutrgb" ) || diff --git a/libavfilter/vsrc_life.c b/libavfilter/vsrc_life.c index d7ed40bf53..2d0b2f524a 100644 --- a/libavfilter/vsrc_life.c +++ b/libavfilter/vsrc_life.c @@ -225,12 +225,6 @@ static int init(AVFilterContext *ctx, const char *args) LifeContext *life = ctx->priv; int ret; - life->class = &life_class; - av_opt_set_defaults(life); - - if ((ret = av_set_options_string(life, args, "=", ":")) < 0) - return ret; - if (!life->w && !life->filename) av_opt_set(life, "size", "320x240", 0); From 791da4706cc386bba2fe439f3b4bd20caf90c3d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20B=C5=93sch?= Date: Wed, 10 Apr 2013 23:26:15 +0200 Subject: [PATCH 3/4] lavfi/mandelbrot: switch to an AVOptions-based system. --- doc/filters.texi | 4 +--- libavfilter/avfilter.c | 1 + libavfilter/vsrc_mandelbrot.c | 6 ------ 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/doc/filters.texi b/doc/filters.texi index e5d2e8e49d..5dfe5a1f5b 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -5919,9 +5919,7 @@ cellauto=p='@@@@ @@ @@@@':s=100x400:full=0:rule=18 Generate a Mandelbrot set fractal, and progressively zoom towards the point specified with @var{start_x} and @var{start_y}. -This source accepts a list of options in the form of -@var{key}=@var{value} pairs separated by ":". A description of the -accepted options follows. +This source accepts the following options: @table @option diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index 717ba8916c..fbf2eecbf7 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -684,6 +684,7 @@ int avfilter_init_filter(AVFilterContext *filter, const char *args, void *opaque !strcmp(filter->filter->name, "lut" ) || !strcmp(filter->filter->name, "lutyuv" ) || !strcmp(filter->filter->name, "lutrgb" ) || + !strcmp(filter->filter->name, "mandelbrot" ) || !strcmp(filter->filter->name, "negate" ) || !strcmp(filter->filter->name, "overlay" ) || !strcmp(filter->filter->name, "pad" ) || diff --git a/libavfilter/vsrc_mandelbrot.c b/libavfilter/vsrc_mandelbrot.c index c91494b11d..d27215c2c3 100644 --- a/libavfilter/vsrc_mandelbrot.c +++ b/libavfilter/vsrc_mandelbrot.c @@ -122,13 +122,7 @@ AVFILTER_DEFINE_CLASS(mandelbrot); static av_cold int init(AVFilterContext *ctx, const char *args) { MBContext *mb = ctx->priv; - int err; - mb->class = &mandelbrot_class; - av_opt_set_defaults(mb); - - if ((err = (av_set_options_string(mb, args, "=", ":"))) < 0) - return err; mb->bailout *= mb->bailout; mb->start_scale /=mb->h; From 4ecee69b20a7ee60fba6cb53ff45d95a015df05b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20B=C5=93sch?= Date: Wed, 10 Apr 2013 23:29:19 +0200 Subject: [PATCH 4/4] lavfi/mptestsrc: switch to an AVOptions-based system. --- doc/filters.texi | 3 +-- libavfilter/avfilter.c | 1 + libavfilter/vsrc_mptestsrc.c | 6 ------ 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/doc/filters.texi b/doc/filters.texi index 5dfe5a1f5b..f68b46a52a 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -5992,8 +5992,7 @@ Generate various test patterns, as generated by the MPlayer test filter. The size of the generated video is fixed, and is 256x256. This source is useful in particular for testing encoding features. -This source accepts an optional sequence of @var{key}=@var{value} pairs, -separated by ":". The description of the accepted options follows. +This source accepts the following options: @table @option diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index fbf2eecbf7..6746dad55b 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -685,6 +685,7 @@ int avfilter_init_filter(AVFilterContext *filter, const char *args, void *opaque !strcmp(filter->filter->name, "lutyuv" ) || !strcmp(filter->filter->name, "lutrgb" ) || !strcmp(filter->filter->name, "mandelbrot" ) || + !strcmp(filter->filter->name, "mptestsrc" ) || !strcmp(filter->filter->name, "negate" ) || !strcmp(filter->filter->name, "overlay" ) || !strcmp(filter->filter->name, "pad" ) || diff --git a/libavfilter/vsrc_mptestsrc.c b/libavfilter/vsrc_mptestsrc.c index 9f1c46f849..e2341081ce 100644 --- a/libavfilter/vsrc_mptestsrc.c +++ b/libavfilter/vsrc_mptestsrc.c @@ -262,12 +262,6 @@ static av_cold int init(AVFilterContext *ctx, const char *args) int64_t duration = -1; int ret; - test->class = &mptestsrc_class; - av_opt_set_defaults(test); - - if ((ret = (av_set_options_string(test, args, "=", ":"))) < 0) - return ret; - if ((test->duration) && (ret = av_parse_time(&duration, test->duration, 1)) < 0) { av_log(ctx, AV_LOG_ERROR, "Invalid duration: '%s'\n", test->duration); return ret;