diff options
| author | Clément Bœsch <ubitux@gmail.com> | 2013-04-10 23:26:15 +0200 |
|---|---|---|
| committer | Clément Bœsch <ubitux@gmail.com> | 2013-04-11 00:21:47 +0200 |
| commit | 791da4706cc386bba2fe439f3b4bd20caf90c3d3 (patch) | |
| tree | f25f425a186dc74b8861b119e90320769f51ba93 | |
| parent | bd85fee91481abd98c0adb37784f9acd3c9f1b94 (diff) | |
| download | ffmpeg-791da4706cc386bba2fe439f3b4bd20caf90c3d3.tar.gz | |
lavfi/mandelbrot: switch to an AVOptions-based system.
| -rw-r--r-- | doc/filters.texi | 4 | ||||
| -rw-r--r-- | libavfilter/avfilter.c | 1 | ||||
| -rw-r--r-- | 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; |