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
6afed2ae
Commit
6afed2ae
authored
Apr 10, 2013
by
Matthieu Bouron
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lavfi/blend: switch to AVOption-based system
parent
ab6091f8
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
2 additions
and
5 deletions
+2
-5
filters.texi
doc/filters.texi
+1
-2
avfilter.c
libavfilter/avfilter.c
+1
-0
vf_blend.c
libavfilter/vf_blend.c
+0
-3
No files found.
doc/filters.texi
View file @
6afed2ae
...
...
@@ -1904,8 +1904,7 @@ It takes two input streams and outputs one stream, the first input is the
"top" layer and second input is "bottom" layer.
Output terminates when shortest input terminates.
This filter accepts a list of options in the form of @var{key}=@var{value}
pairs separated by ":". A description of the accepted options follows.
A description of the accepted options follows.
@table @option
@item c0_mode
...
...
libavfilter/avfilter.c
View file @
6afed2ae
...
...
@@ -659,6 +659,7 @@ int avfilter_init_filter(AVFilterContext *filter, const char *args, void *opaque
!
strcmp
(
filter
->
filter
->
name
,
"aformat"
)
||
!
strcmp
(
filter
->
filter
->
name
,
"ass"
)
||
!
strcmp
(
filter
->
filter
->
name
,
"blackframe"
)
||
!
strcmp
(
filter
->
filter
->
name
,
"blend"
)
||
!
strcmp
(
filter
->
filter
->
name
,
"boxblur"
)
||
!
strcmp
(
filter
->
filter
->
name
,
"cellauto"
)
||
!
strcmp
(
filter
->
filter
->
name
,
"colormatrix"
)
||
...
...
libavfilter/vf_blend.c
View file @
6afed2ae
...
...
@@ -453,8 +453,6 @@ static const AVFilterPad blend_outputs[] = {
{
NULL
}
};
static
const
char
*
const
shorthand
[]
=
{
NULL
};
AVFilter
avfilter_vf_blend
=
{
.
name
=
"blend"
,
.
description
=
NULL_IF_CONFIG_SMALL
(
"Blend two video frames into each other."
),
...
...
@@ -465,5 +463,4 @@ AVFilter avfilter_vf_blend = {
.
inputs
=
blend_inputs
,
.
outputs
=
blend_outputs
,
.
priv_class
=
&
blend_class
,
.
shorthand
=
shorthand
,
};
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