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

This commit is contained in:
Clément Bœsch 2013-04-10 23:21:21 +02:00
parent 2040b428b4
commit 169880e31d
3 changed files with 2 additions and 9 deletions

View File

@ -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 the cellular automaton next generation. The behavior when the whole
frame is filled is defined by the @option{scroll} option. frame is filled is defined by the @option{scroll} option.
This source accepts a list of options in the form of This source accepts the following options:
@var{key}=@var{value} pairs separated by ":". A description of the
accepted options follows.
@table @option @table @option
@item filename, f @item filename, f

View File

@ -660,6 +660,7 @@ int avfilter_init_filter(AVFilterContext *filter, const char *args, void *opaque
!strcmp(filter->filter->name, "ass") || !strcmp(filter->filter->name, "ass") ||
!strcmp(filter->filter->name, "blackframe") || !strcmp(filter->filter->name, "blackframe") ||
!strcmp(filter->filter->name, "boxblur" ) || !strcmp(filter->filter->name, "boxblur" ) ||
!strcmp(filter->filter->name, "cellauto") ||
!strcmp(filter->filter->name, "colormatrix") || !strcmp(filter->filter->name, "colormatrix") ||
!strcmp(filter->filter->name, "crop" ) || !strcmp(filter->filter->name, "crop" ) ||
!strcmp(filter->filter->name, "cropdetect") || !strcmp(filter->filter->name, "cropdetect") ||

View File

@ -164,12 +164,6 @@ static int init(AVFilterContext *ctx, const char *args)
CellAutoContext *cellauto = ctx->priv; CellAutoContext *cellauto = ctx->priv;
int ret; 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) if (!cellauto->w && !cellauto->filename && !cellauto->pattern)
av_opt_set(cellauto, "size", "320x518", 0); av_opt_set(cellauto, "size", "320x518", 0);