From 6f46403cb0568440e9f0b177c6f6abb4d0898309 Mon Sep 17 00:00:00 2001
From: Matthieu Bouron <matthieu.bouron@gmail.com>
Date: Thu, 11 Apr 2013 00:27:31 +0200
Subject: [PATCH 1/2] lavfi/il: switch to AVOption-based system

---
 doc/filters.texi       | 3 +--
 libavfilter/avfilter.c | 1 +
 libavfilter/vf_il.c    | 3 ---
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/doc/filters.texi b/doc/filters.texi
index b2d375df5a..cd81a71748 100644
--- a/doc/filters.texi
+++ b/doc/filters.texi
@@ -3750,8 +3750,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
diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c
index 753567fe81..8864a6b8b8 100644
--- a/libavfilter/avfilter.c
+++ b/libavfilter/avfilter.c
@@ -678,6 +678,7 @@ 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, "ocv"        ) ||
         !strcmp(filter->filter->name, "lut"        ) ||
         !strcmp(filter->filter->name, "lutyuv"     ) ||
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,
 };

From 531158e6becb6f822280a12277b6627a47e49b6a Mon Sep 17 00:00:00 2001
From: Matthieu Bouron <matthieu.bouron@gmail.com>
Date: Thu, 11 Apr 2013 00:52:39 +0200
Subject: [PATCH 2/2] lavfi/kerndeint: switch to AVOption-based system

---
 doc/filters.texi           | 5 -----
 libavfilter/avfilter.c     | 1 +
 libavfilter/vf_kerndeint.c | 2 --
 3 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/doc/filters.texi b/doc/filters.texi
index cd81a71748..74053e41b6 100644
--- a/doc/filters.texi
+++ b/doc/filters.texi
@@ -3783,11 +3783,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 8864a6b8b8..3992df7b86 100644
--- a/libavfilter/avfilter.c
+++ b/libavfilter/avfilter.c
@@ -679,6 +679,7 @@ int avfilter_init_filter(AVFilterContext *filter, const char *args, void *opaque
         !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, "lut"        ) ||
         !strcmp(filter->filter->name, "lutyuv"     ) ||
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,
 };