diff options
| author | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2010-11-30 20:14:41 +0000 |
|---|---|---|
| committer | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2010-11-30 20:14:41 +0000 |
| commit | f51aeedd416667f969acdddf21d6a89418b55eb1 (patch) | |
| tree | c6e4bb7873690f6eba075f66be33d2fbe64b4bf1 | |
| parent | f8608dcac35bbb13906ba46ea261fefe73382cf8 (diff) | |
| download | ffmpeg-f51aeedd416667f969acdddf21d6a89418b55eb1.tar.gz | |
Extend the frei0r filter syntax.
Make it accept the frei0r=filtername=params as alternative to
frei0r=filtername:params.
Originally committed as revision 25856 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | doc/filters.texi | 2 | ||||
| -rw-r--r-- | libavfilter/vf_frei0r.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/doc/filters.texi b/doc/filters.texi index c939b8766c..9583e4e41b 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -293,7 +293,7 @@ header and configure FFmpeg with --enable-frei0r. The filter supports the syntax: @example -@var{filter_name}:@var{param1}:@var{param2}:...:@var{paramN} +@var{filter_name}[@{:|=@}@var{param1}:@var{param2}:...:@var{paramN}] @end example @var{filter_name} is the name to the frei0r effect to load. If the diff --git a/libavfilter/vf_frei0r.c b/libavfilter/vf_frei0r.c index 235b37a776..03d4f28f2d 100644 --- a/libavfilter/vf_frei0r.c +++ b/libavfilter/vf_frei0r.c @@ -277,11 +277,11 @@ static av_cold int frei0r_init(AVFilterContext *ctx, static av_cold int filter_init(AVFilterContext *ctx, const char *args, void *opaque) { Frei0rContext *frei0r = ctx->priv; - char dl_name[1024]; + char dl_name[1024], c; *frei0r->params = 0; if (args) - sscanf(args, "%1023[^:]:%255c", dl_name, frei0r->params); + sscanf(args, "%1023[^:=]%c%255c", dl_name, &c, frei0r->params); return frei0r_init(ctx, dl_name, F0R_PLUGIN_TYPE_FILTER); } |