Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
F
ffmpeg.wasm-core
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Linshizhi
ffmpeg.wasm-core
Commits
e2b0edb6
Commit
e2b0edb6
authored
Apr 10, 2013
by
Clément Bœsch
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lavfi/subtitles: switch to an AVOptions-based system.
parent
8da1fff8
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
6 deletions
+3
-6
filters.texi
doc/filters.texi
+1
-2
avfilter.c
libavfilter/avfilter.c
+2
-0
vf_subtitles.c
libavfilter/vf_subtitles.c
+0
-4
No files found.
doc/filters.texi
View file @
e2b0edb6
...
...
@@ -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
...
...
libavfilter/avfilter.c
View file @
e2b0edb6
...
...
@@ -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
...
...
libavfilter/vf_subtitles.c
View file @
e2b0edb6
...
...
@@ -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
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment