Merge remote-tracking branch 'mbouron/shorthand-cleanup'

* mbouron/shorthand-cleanup:
  lavfi/aphaser: switch to AVOption-based system
  lavfi/apad: switch to AVOption-based system
  lavfi/afade: switch to AVOption-base system
  lavfi/blend: switch to AVOption-based system

Conflicts:
	libavfilter/avfilter.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

doc/filters.texi

@@ -610,9 +610,6 @@ Beware of clipping when using a positive gain.
 
 Apply fade-in/out effect to input audio.
 
-The filter accepts parameters as a list of @var{key}=@var{value}
-pairs, separated by ":".
-
 A description of the accepted parameters follows.
 
 @table @option
@@ -1904,8 +1901,7 @@ It takes two input streams and outputs one stream, the first input is the
 "top" layer and second input is "bottom" layer.
 Output terminates when shortest input terminates.
 
-This filter accepts a list of options in the form of @var{key}=@var{value}
+A description of the accepted options follows.
-pairs separated by ":". A description of the accepted options follows.
 
 @table @option
 @item c0_mode
@@ -6347,9 +6343,6 @@ Add a phasing effect to the input audio.
 A phaser filter creates series of peaks and troughs in the frequency spectrum.
 The position of the peaks and troughs are modulated so that they vary over time, creating a sweeping effect.
 
-The filter accepts parameters as a list of @var{key}=@var{value}
-pairs, separated by ":".
-
 A description of the accepted parameters follows.
 
 @table @option

libavfilter/af_afade.c

@@ -288,8 +288,6 @@ static const AVFilterPad avfilter_af_afade_outputs[] = {
     { NULL }
 };
 
-static const char *const shorthand[] = { NULL };
-
 AVFilter avfilter_af_afade = {
     .name          = "afade",
     .description   = NULL_IF_CONFIG_SMALL("Fade in/out input audio."),
@@ -299,5 +297,4 @@ AVFilter avfilter_af_afade = {
     .inputs        = avfilter_af_afade_inputs,
     .outputs       = avfilter_af_afade_outputs,
     .priv_class    = &afade_class,
-    .shorthand     = shorthand,
 };

libavfilter/af_apad.c

@@ -144,8 +144,6 @@ static const AVFilterPad apad_outputs[] = {
     { NULL },
 };
 
-static const char *const shorthand[] = { NULL };
-
 AVFilter avfilter_af_apad = {
     .name          = "apad",
     .description   = NULL_IF_CONFIG_SMALL("Pad audio with silence."),
@@ -154,5 +152,4 @@ AVFilter avfilter_af_apad = {
     .inputs        = apad_inputs,
     .outputs       = apad_outputs,
     .priv_class    = &apad_class,
-    .shorthand     = shorthand,
 };

libavfilter/af_aphaser.c

@@ -344,8 +344,6 @@ static const AVFilterPad aphaser_outputs[] = {
     { NULL }
 };
 
-static const char *const shorthand[] = { "in_gain", "out_gain", "delay", "decay", "speed", "type", NULL };
-
 AVFilter avfilter_af_aphaser = {
     .name          = "aphaser",
     .description   = NULL_IF_CONFIG_SMALL("Add a phasing effect to the audio."),
@@ -356,5 +354,4 @@ AVFilter avfilter_af_aphaser = {
     .inputs        = aphaser_inputs,
     .outputs       = aphaser_outputs,
     .priv_class    = &aphaser_class,
-    .shorthand     = shorthand,
 };

libavfilter/avfilter.c

@@ -656,11 +656,15 @@ int avfilter_init_filter(AVFilterContext *filter, const char *args, void *opaque
     AVDictionaryEntry *e;
     int ret=0;
     int anton_options =
+        !strcmp(filter->filter->name,  "afade"     ) ||
         !strcmp(filter->filter->name,  "aformat") ||
         !strcmp(filter->filter->name,  "amix"      ) ||
+        !strcmp(filter->filter->name,  "apad"      ) ||
+        !strcmp(filter->filter->name,  "aphaser"   ) ||
         !strcmp(filter->filter->name,  "ass")     ||
         !strcmp(filter->filter->name,  "asyncts"   ) ||
         !strcmp(filter->filter->name,  "blackframe") ||
+        !strcmp(filter->filter->name,  "blend"     ) ||
         !strcmp(filter->filter->name,  "boxblur"   ) ||
         !strcmp(filter->filter->name,  "cellauto") ||
         !strcmp(filter->filter->name,  "colormatrix") ||

libavfilter/vf_blend.c

@@ -453,8 +453,6 @@ 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."),
@@ -465,5 +463,4 @@ AVFilter avfilter_vf_blend = {
     .inputs        = blend_inputs,
     .outputs       = blend_outputs,
     .priv_class    = &blend_class,
-    .shorthand     = shorthand,
 };