[FFmpeg-cvslog] lavfi/tinterlace: switch to an AVOptions-based system.

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch <ubitux at gmail.com> | Thu Apr 11 11:35:01 2013 +0200| [c85f56bb4fd8051a2e365ed71bdf3e4a3f0d9faa] | committer: Clément Bœsch

lavfi/tinterlace: switch to an AVOptions-based system.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c85f56bb4fd8051a2e365ed71bdf3e4a3f0d9faa
---

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

diff --git a/doc/filters.texi b/doc/filters.texi
index a0616bf..d9a3599 100644
--- a/doc/filters.texi
+++ b/doc/filters.texi
@@ -5465,13 +5465,7 @@ Perform various types of temporal field interlacing.
 Frames are counted starting from 1, so the first input frame is
 considered odd.
 
-This filter accepts options in the form of @var{key}=@var{value} pairs
-separated by ":".
-Alternatively, the @var{mode} option can be specified as a value alone,
-optionally followed by a ":" and further ":" separated @var{key}=@var{value}
-pairs.
-
-A description of the accepted options follows.
+The filter accepts the following options:
 
 @table @option
 
diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c
index de47b80..363614e 100644
--- a/libavfilter/avfilter.c
+++ b/libavfilter/avfilter.c
@@ -758,6 +758,7 @@ int avfilter_init_filter(AVFilterContext *filter, const char *args, void *opaque
         !strcmp(filter->filter->name, "testsrc"  ) ||
         !strcmp(filter->filter->name, "thumbnail") ||
         !strcmp(filter->filter->name, "tile") ||
+        !strcmp(filter->filter->name, "tinterlace") ||
         !strcmp(filter->filter->name, "transpose") ||
         !strcmp(filter->filter->name, "treble"    ) ||
         !strcmp(filter->filter->name, "unsharp"  ) ||
diff --git a/libavfilter/vf_tinterlace.c b/libavfilter/vf_tinterlace.c
index 6ff2140..13b8ce2 100644
--- a/libavfilter/vf_tinterlace.c
+++ b/libavfilter/vf_tinterlace.c
@@ -385,8 +385,6 @@ static const AVFilterPad tinterlace_outputs[] = {
     { NULL }
 };
 
-static const char *const shorthand[] = { "mode", NULL };
-
 AVFilter avfilter_vf_tinterlace = {
     .name          = "tinterlace",
     .description   = NULL_IF_CONFIG_SMALL("Perform temporal field interlacing."),
@@ -396,5 +394,4 @@ AVFilter avfilter_vf_tinterlace = {
     .inputs        = tinterlace_inputs,
     .outputs       = tinterlace_outputs,
     .priv_class    = &tinterlace_class,
-    .shorthand     = shorthand,
 };