[FFmpeg-cvslog] lavfi/cellauto: switch to an AVOptions-based system.

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch <ubitux at gmail.com> | Wed Apr 10 23:21:21 2013 +0200| [169880e31d627925a3c27c703525da57af74f740] | committer: Clément Bœsch

lavfi/cellauto: switch to an AVOptions-based system.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=169880e31d627925a3c27c703525da57af74f740
---

 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 b2d375d..5ff34e0 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
- at 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 753567f..dbc517e 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 a48f04c..3a4917a 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);