OSDN Git Service

Extend the frei0r filter syntax.
authorStefano Sabatini <stefano.sabatini-lala@poste.it>
Tue, 30 Nov 2010 20:14:41 +0000 (20:14 +0000)
committerStefano Sabatini <stefano.sabatini-lala@poste.it>
Tue, 30 Nov 2010 20:14:41 +0000 (20:14 +0000)
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

doc/filters.texi
libavfilter/vf_frei0r.c

index c939b87..9583e4e 100644 (file)
@@ -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
index 235b37a..03d4f28 100644 (file)
@@ -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);
 }