From 2040b428b45fa4f0167acc40a49771f92cd96769 Mon Sep 17 00:00:00 2001
From: Stefano Sabatini <stefasab@gmail.com>
Date: Thu, 11 Apr 2013 00:14:06 +0200
Subject: [PATCH] lavfi/field: switch to AVOption-based system

Also remove mention to syntax explanation which is or will be redundant
and possibly confusing.
---
 doc/filters.texi       | 11 -----------
 libavfilter/avfilter.c |  1 +
 libavfilter/vf_field.c |  1 -
 3 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/doc/filters.texi b/doc/filters.texi
index 251bcb5bc7..b2d375df5a 100644
--- a/doc/filters.texi
+++ b/doc/filters.texi
@@ -3112,17 +3112,6 @@ Specify whether to extract the top (if the value is @code{0} or
 @code{bottom}).
 @end table
 
-If the option key is not specified, the first value sets the @var{type}
-option. For example:
-@example
-field=bottom
-@end example
-
-is equivalent to:
-@example
-field=type=bottom
-@end example
-
 @section fieldorder
 
 Transform the field order of the input video.
diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c
index 71d5e9cc4e..753567fe81 100644
--- a/libavfilter/avfilter.c
+++ b/libavfilter/avfilter.c
@@ -670,6 +670,7 @@ int avfilter_init_filter(AVFilterContext *filter, const char *args, void *opaque
         !strcmp(filter->filter->name,  "ebur128"   ) ||
         !strcmp(filter->filter->name,  "edgedetect") ||
         !strcmp(filter->filter->name,  "fade"      ) ||
+        !strcmp(filter->filter->name,  "field"     ) ||
         !strcmp(filter->filter->name,  "fieldorder") ||
         !strcmp(filter->filter->name,  "fps"       ) ||
         !strcmp(filter->filter->name,  "frei0r"    ) ||
diff --git a/libavfilter/vf_field.c b/libavfilter/vf_field.c
index eb8680df9e..c113512b74 100644
--- a/libavfilter/vf_field.c
+++ b/libavfilter/vf_field.c
@@ -117,5 +117,4 @@ AVFilter avfilter_vf_field = {
     .inputs        = field_inputs,
     .outputs       = field_outputs,
     .priv_class    = &field_class,
-    .shorthand     = shorthand,
 };