From 77add967a5e5dae8f322578580c440cb990624ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20B=C5=93sch?= <ubitux@gmail.com>
Date: Thu, 11 Apr 2013 11:50:56 +0200
Subject: [PATCH] lavfi/setfield: switch to an AVOptions-based system.

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

diff --git a/doc/filters.texi b/doc/filters.texi
index 94518d1514..af4bccbe5e 100644
--- a/doc/filters.texi
+++ b/doc/filters.texi
@@ -5057,9 +5057,12 @@ output frames. It does not change the input frame, but only sets the
 corresponding property, which affects how the frame is treated by
 following filters (e.g. @code{fieldorder} or @code{yadif}).
 
-This filter accepts a single option @option{mode}, which can be
-specified either by setting @code{mode=VALUE} or setting the value
-alone. Available values are:
+The filter accepts the following options:
+
+@table @option
+
+@item mode
+Available values are:
 
 @table @samp
 @item auto
@@ -5074,6 +5077,7 @@ Mark the frame as top-field-first.
 @item prog
 Mark the frame as progressive.
 @end table
+@end table
 
 @section showinfo
 
diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c
index a6a426c7e8..7c2abdcdbf 100644
--- a/libavfilter/avfilter.c
+++ b/libavfilter/avfilter.c
@@ -751,6 +751,7 @@ int avfilter_init_filter(AVFilterContext *filter, const char *args, void *opaque
         !strcmp(filter->filter->name, "setpts"       ) ||
         !strcmp(filter->filter->name, "settb"        ) ||
         !strcmp(filter->filter->name, "asettb"       ) ||
+        !strcmp(filter->filter->name, "setfield") ||
         !strcmp(filter->filter->name, "showspectrum") ||
         !strcmp(filter->filter->name, "silencedetect") ||
         !strcmp(filter->filter->name, "sine"     ) ||
diff --git a/libavfilter/vf_setfield.c b/libavfilter/vf_setfield.c
index 22b3101b7b..4d42cfa968 100644
--- a/libavfilter/vf_setfield.c
+++ b/libavfilter/vf_setfield.c
@@ -85,8 +85,6 @@ static const AVFilterPad setfield_outputs[] = {
     { NULL }
 };
 
-static const char *const shorthand[] = { "mode", NULL };
-
 AVFilter avfilter_vf_setfield = {
     .name      = "setfield",
     .description = NULL_IF_CONFIG_SMALL("Force field for the output video frame."),
@@ -94,5 +92,4 @@ AVFilter avfilter_vf_setfield = {
     .inputs    = setfield_inputs,
     .outputs   = setfield_outputs,
     .priv_class = &setfield_class,
-    .shorthand  = shorthand,
 };