generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
Clément Bœsch 2013-04-10 23:10:05 +02:00
parent 8da1fff85a
commit e2b0edb6ac
3 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
doc/filters.texi
View File

@ -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

2
libavfilter/avfilter.c
View File

@ -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

4
libavfilter/vf_subtitles.c
View File

@ -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