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

* mbouron/shorthand-cleanup:
  lavfi/kerndeint: switch to AVOption-based system
  lavfi/il: switch to AVOption-based system

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

4 files changed, 3 insertions, 12 deletions

diff --git a/doc/filters.texi b/doc/filters.texi
index 72bfce66ff..c3bd741a71 100644
--- a/doc/filters.texi
+++ b/doc/filters.texi
@@ -3745,8 +3745,7 @@ fields (so called half pictures). Odd lines are moved to the top
 half of the output image, even lines to the bottom half.
 You can process (filter) them independently and then re-interleave them.
 
-It accepts a list of options in the form of @var{key}=@var{value} pairs
-separated by ":". A description of the accepted options follows.
+The filter accepts the following options:
 
 @table @option
 @item luma_mode, l
@@ -3779,11 +3778,6 @@ Deinterlace input video by applying Donald Graft's adaptive kernel
 deinterling. Work on interlaced parts of a video to produce
 progressive frames.
 
-This filter accepts parameters as a list of @var{key}=@var{value}
-pairs, separated by ":". If the key of the first options is omitted,
-the arguments are interpreted according to the following syntax:
-@var{thresh}:@var{map}:@var{order}:@var{sharp}:@var{twoway}.
-
 The description of the accepted parameters follows.
 
 @table @option
diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c
index 036949d467..490f27b817 100644
--- a/libavfilter/avfilter.c
+++ b/libavfilter/avfilter.c
@@ -680,6 +680,8 @@ int avfilter_init_filter(AVFilterContext *filter, const char *args, void *opaque
         !strcmp(filter->filter->name,  "geq"       ) ||
         !strcmp(filter->filter->name, "gradfun"    ) ||
         !strcmp(filter->filter->name, "hqdn3d"     ) ||
+        !strcmp(filter->filter->name,  "il"        ) ||
+        !strcmp(filter->filter->name,  "kerndeint" ) ||
         !strcmp(filter->filter->name, "ocv"        ) ||
         !strcmp(filter->filter->name, "life"       ) ||
         !strcmp(filter->filter->name, "lut"        ) ||
diff --git a/libavfilter/vf_il.c b/libavfilter/vf_il.c
index 7eee398ea0..904be8c1c4 100644
--- a/libavfilter/vf_il.c
+++ b/libavfilter/vf_il.c
@@ -204,8 +204,6 @@ static const AVFilterPad outputs[] = {
     { NULL }
 };
 
-static const char *const shorthand[] = { NULL };
-
 AVFilter avfilter_vf_il = {
     .name          = "il",
     .description   = NULL_IF_CONFIG_SMALL("Deinterleave or interleave fields."),
@@ -214,5 +212,4 @@ AVFilter avfilter_vf_il = {
     .inputs        = inputs,
     .outputs       = outputs,
     .priv_class    = &il_class,
-    .shorthand     = shorthand,
 };
diff --git a/libavfilter/vf_kerndeint.c b/libavfilter/vf_kerndeint.c
index 2b29bdcef9..8a44868138 100644
--- a/libavfilter/vf_kerndeint.c
+++ b/libavfilter/vf_kerndeint.c
@@ -305,7 +305,6 @@ static const AVFilterPad kerndeint_outputs[] = {
     { NULL }
 };
 
-static const char *const shorthand[] = { "thresh", "map", "order", "sharp", "twoway", NULL };
 
 AVFilter avfilter_vf_kerndeint = {
     .name          = "kerndeint",
@@ -318,5 +317,4 @@ AVFilter avfilter_vf_kerndeint = {
     .outputs       = kerndeint_outputs,
 
     .priv_class    = &kerndeint_class,
-    .shorthand     = shorthand,
 };