]> git.sesse.net Git - ffmpeg/commitdiff
lavfi/blend: use standard options parsing
authorPaul B Mahol <onemda@gmail.com>
Fri, 5 Apr 2013 00:12:22 +0000 (00:12 +0000)
committerPaul B Mahol <onemda@gmail.com>
Fri, 5 Apr 2013 00:14:55 +0000 (00:14 +0000)
Signed-off-by: Paul B Mahol <onemda@gmail.com>
libavfilter/vf_blend.c

index 1a88db1ce75876b3ee2e20a39ce1376af2b87b5a..782bf4bf8f1412e1e470feb784e840c943d4921e 100644 (file)
@@ -225,12 +225,6 @@ static av_cold int init(AVFilterContext *ctx, const char *args)
     BlendContext *b = ctx->priv;
     int ret, plane;
 
-    b->class = &blend_class;
-    av_opt_set_defaults(b);
-
-    if ((ret = av_set_options_string(b, args, "=", ":")) < 0)
-        return ret;
-
     for (plane = 0; plane < FF_ARRAY_ELEMS(b->params); plane++) {
         FilterParams *param = &b->params[plane];
 
@@ -460,6 +454,8 @@ static const AVFilterPad blend_outputs[] = {
     { NULL }
 };
 
+static const char *const shorthand[] = { NULL };
+
 AVFilter avfilter_vf_blend = {
     .name          = "blend",
     .description   = NULL_IF_CONFIG_SMALL("Blend two video frames into each other."),
@@ -470,4 +466,5 @@ AVFilter avfilter_vf_blend = {
     .inputs        = blend_inputs,
     .outputs       = blend_outputs,
     .priv_class    = &blend_class,
+    .shorthand     = shorthand,
 };