From 7c11c216690c11a4e578353fb05f0f64978eeaf2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20B=C5=93sch?= <ubitux@gmail.com>
Date: Wed, 10 Apr 2013 21:57:07 +0200
Subject: [PATCH] lavfi/thumbnail: switch to an AVOptions-based system.

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

diff --git a/doc/filters.texi b/doc/filters.texi
index 03113cd387..11e33e698a 100644
--- a/doc/filters.texi
+++ b/doc/filters.texi
@@ -5392,10 +5392,7 @@ Swap U & V plane.
 @section thumbnail
 Select the most representative frame in a given sequence of consecutive frames.
 
-The 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 syntax
-thumbnail[=@var{n}].
+The filter accepts the following options:
 
 @table @option
 @item n
diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c
index addb7321e1..5fe6f1982f 100644
--- a/libavfilter/avfilter.c
+++ b/libavfilter/avfilter.c
@@ -681,6 +681,7 @@ int avfilter_init_filter(AVFilterContext *filter, const char *args, void *opaque
         !strcmp(filter->filter->name,   "format") ||
         !strcmp(filter->filter->name, "noformat") ||
         !strcmp(filter->filter->name, "resample") ||
+        !strcmp(filter->filter->name, "thumbnail") ||
 //         !strcmp(filter->filter->name, "scale"      ) ||
         0
         ;
diff --git a/libavfilter/vf_thumbnail.c b/libavfilter/vf_thumbnail.c
index d32c6c7b29..2cf702c7f7 100644
--- a/libavfilter/vf_thumbnail.c
+++ b/libavfilter/vf_thumbnail.c
@@ -227,8 +227,6 @@ static const AVFilterPad thumbnail_outputs[] = {
     { NULL }
 };
 
-static const char *const shorthand[] = { "n", NULL };
-
 AVFilter avfilter_vf_thumbnail = {
     .name          = "thumbnail",
     .description   = NULL_IF_CONFIG_SMALL("Select the most representative frame in a given sequence of consecutive frames."),
@@ -239,5 +237,4 @@ AVFilter avfilter_vf_thumbnail = {
     .inputs        = thumbnail_inputs,
     .outputs       = thumbnail_outputs,
     .priv_class    = &thumbnail_class,
-    .shorthand     = shorthand,
 };