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

Clément Bœsch committed 13 years ago

Commit e2b0edb1 parent 8da1fff3 files · +3 −6Browse files

Unified · Split

3 files

@@ -5322,8 +5322,7 @@ To enable compilation of this filter you need to configure FFmpeg with · 5321 unmodified lines
5322	libavformat to convert the passed subtitles file to ASS (Advanced Substation	5322	libavformat to convert the passed subtitles file to ASS (Advanced Substation
5323	Alpha) subtitles format.	5323	Alpha) subtitles format.
5324		5324
5325	This filter accepts the following named options, expressed as a	5325	The filter accepts the following options:
5326	sequence of @var{key}=@var{value} pairs, separated by ":".
5327		5326
5328	@table @option	5327	@table @option
5329	@item filename, f	5328	@item filename, f

     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") ||
         !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

     { NULL }
 };
-static const char *const shorthand[] = { "filename", NULL };
 #if CONFIG_ASS_FILTER
 static const AVOption ass_options[] = {
     .inputs        = ass_inputs,
     .outputs       = ass_outputs,
     .priv_class    = &ass_class,
-    .shorthand     = shorthand,
 };
 #endif
     .inputs        = ass_inputs,
     .outputs       = ass_outputs,
     .priv_class    = &subtitles_class,
-    .shorthand     = shorthand,
 };
 #endif

Keyboard shortcuts