From e2b0edb6ac9ca2713d8f3846dd0ca265815fa6ea 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 23:10:05 +0200
Subject: [PATCH] lavfi/subtitles: switch to an AVOptions-based system.

---
 doc/filters.texi           | 3 +--
 libavfilter/avfilter.c     | 2 ++
 libavfilter/vf_subtitles.c | 4 ----
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/doc/filters.texi b/doc/filters.texi
index ed192189d3..49bc8b3b78 100644
--- a/doc/filters.texi
+++ b/doc/filters.texi
@@ -5322,8 +5322,7 @@ To enable compilation of this filter you need to configure FFmpeg with
 libavformat to convert the passed subtitles file to ASS (Advanced Substation
 Alpha) subtitles format.
 
-This filter accepts the following named options, expressed as a
-sequence of @var{key}=@var{value} pairs, separated by ":".
+The filter accepts the following options:
 
 @table @option
 @item filename, f
diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c
index 13e9ac9098..1589cc961c 100644
--- a/libavfilter/avfilter.c
+++ b/libavfilter/avfilter.c
@@ -657,6 +657,7 @@ int avfilter_init_filter(AVFilterContext *filter, const char *args, void *opaque
     int ret=0;
     int anton_options =
         !strcmp(filter->filter->name,  "aformat") ||
+        !strcmp(filter->filter->name,  "ass")     ||
         !strcmp(filter->filter->name,  "blackframe") ||
         !strcmp(filter->filter->name,  "boxblur"   ) ||
         !strcmp(filter->filter->name,  "colormatrix") ||
@@ -691,6 +692,7 @@ int avfilter_init_filter(AVFilterContext *filter, const char *args, void *opaque
         !strcmp(filter->filter->name, "resample") ||
         !strcmp(filter->filter->name, "showspectrum") ||
         !strcmp(filter->filter->name, "silencedetect") ||
+        !strcmp(filter->filter->name, "subtitles") ||
         !strcmp(filter->filter->name, "thumbnail") ||
 //         !strcmp(filter->filter->name, "scale"      ) ||
         0
diff --git a/libavfilter/vf_subtitles.c b/libavfilter/vf_subtitles.c
index 8bca01ef83..5c1314f730 100644
--- a/libavfilter/vf_subtitles.c
+++ b/libavfilter/vf_subtitles.c
@@ -201,8 +201,6 @@ static const AVFilterPad ass_outputs[] = {
     { NULL }
 };
 
-static const char *const shorthand[] = { "filename", NULL };
-
 #if CONFIG_ASS_FILTER
 
 static const AVOption ass_options[] = {
@@ -240,7 +238,6 @@ AVFilter avfilter_vf_ass = {
     .inputs        = ass_inputs,
     .outputs       = ass_outputs,
     .priv_class    = &ass_class,
-    .shorthand     = shorthand,
 };
 #endif
 
@@ -365,6 +362,5 @@ AVFilter avfilter_vf_subtitles = {
     .inputs        = ass_inputs,
     .outputs       = ass_outputs,
     .priv_class    = &subtitles_class,
-    .shorthand     = shorthand,
 };
 #endif