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>

5 files changed, 4 insertions, 12 deletions

diff --git a/libavfilter/af_afade.c b/libavfilter/af_afade.c
index 2ab467489e..a00d0e4da6 100644
--- a/libavfilter/af_afade.c
+++ b/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,
 };
diff --git a/libavfilter/af_apad.c b/libavfilter/af_apad.c
index 3c972e9d40..8c8690ee7c 100644
--- a/libavfilter/af_apad.c
+++ b/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,
 };
diff --git a/libavfilter/af_aphaser.c b/libavfilter/af_aphaser.c
index 141278fa20..d61715dd7e 100644
--- a/libavfilter/af_aphaser.c
+++ b/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,
 };
diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c
index abf8cd6e41..4696eaeb5e 100644
--- a/libavfilter/avfilter.c
+++ b/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") ||
diff --git a/libavfilter/vf_blend.c b/libavfilter/vf_blend.c
index 434b470561..d279e3a836 100644
--- a/libavfilter/vf_blend.c
+++ b/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,
 };