History

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
  1. doc/filters.texi +1 −2
  2. libavfilter/avfilter.c +2 −0
  3. libavfilter/vf_subtitles.c +0 −4
doc/filters.texi+1−2
@@ -5322,8 +5322,7 @@ To enable compilation of this filter you need to configure FFmpeg with · 5321 unmodified lines
53225322 libavformat to convert the passed subtitles file to ASS (Advanced Substation
53235323 Alpha) subtitles format.
53245324
5325−This filter accepts the following named options, expressed as a
5326−sequence of @var{key}=@var{value} pairs, separated by ":".
5325+The filter accepts the following options:
53275326
53285327 @table @option
53295328 @item filename, f
libavfilter/avfilter.c+2−0
@@ -657,6 +657,7 @@ int avfilter_init_filter(AVFilterContext *filter, const char *args, void *opaque · 656 unmodified lines
657657 int ret=0;
658658 int anton_options =
659659 !strcmp(filter->filter->name, "aformat") ||
660+ !strcmp(filter->filter->name, "ass") ||
660661 !strcmp(filter->filter->name, "blackframe") ||
661662 !strcmp(filter->filter->name, "boxblur" ) ||
662663 !strcmp(filter->filter->name, "colormatrix") ||
@@ -691,6 +692,7 @@ int avfilter_init_filter(AVFilterContext *filter, const char *args, void *opaque · 28 unmodified lines
691692 !strcmp(filter->filter->name, "resample") ||
692693 !strcmp(filter->filter->name, "showspectrum") ||
693694 !strcmp(filter->filter->name, "silencedetect") ||
695+ !strcmp(filter->filter->name, "subtitles") ||
694696 !strcmp(filter->filter->name, "thumbnail") ||
695697 // !strcmp(filter->filter->name, "scale" ) ||
696698 0
libavfilter/vf_subtitles.c+0−4
@@ -201,8 +201,6 @@ static const AVFilterPad ass_outputs[] = { · 200 unmodified lines
201201 { NULL }
202202 };
203203
204−static const char *const shorthand[] = { "filename", NULL };
205−
206204 #if CONFIG_ASS_FILTER
207205
208206 static const AVOption ass_options[] = {
@@ -240,7 +238,6 @@ AVFilter avfilter_vf_ass = { · 31 unmodified lines
240238 .inputs = ass_inputs,
241239 .outputs = ass_outputs,
242240 .priv_class = &ass_class,
243− .shorthand = shorthand,
244241 };
245242 #endif
246243
@@ -365,6 +362,5 @@ AVFilter avfilter_vf_subtitles = { · 118 unmodified lines
365362 .inputs = ass_inputs,
366363 .outputs = ass_outputs,
367364 .priv_class = &subtitles_class,
368− .shorthand = shorthand,
369365 };
370366 #endif

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t