virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

lavfi/blend: switch to AVOption-based system

Browse Source
This commit is contained in:
Matthieu Bouron 2013-04-11 01:06:16 +02:00
parent ab6091f8e2
commit 6afed2aec1
3 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
doc/filters.texi
View File

@ -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. "top" layer and second input is "bottom" layer.
Output terminates when shortest input terminates. Output terminates when shortest input terminates.
This filter accepts a list of options in the form of @var{key}=@var{value} A description of the accepted options follows.
pairs separated by ":". A description of the accepted options follows.
@table @option @table @option
@item c0_mode @item c0_mode

1
libavfilter/avfilter.c
View File

@ -659,6 +659,7 @@ int avfilter_init_filter(AVFilterContext *filter, const char *args, void *opaque
!strcmp(filter->filter->name, "aformat") || !strcmp(filter->filter->name, "aformat") ||
!strcmp(filter->filter->name, "ass") || !strcmp(filter->filter->name, "ass") ||
!strcmp(filter->filter->name, "blackframe") || !strcmp(filter->filter->name, "blackframe") ||
!strcmp(filter->filter->name, "blend" ) ||
!strcmp(filter->filter->name, "boxblur" ) || !strcmp(filter->filter->name, "boxblur" ) ||
!strcmp(filter->filter->name, "cellauto") || !strcmp(filter->filter->name, "cellauto") ||
!strcmp(filter->filter->name, "colormatrix") || !strcmp(filter->filter->name, "colormatrix") ||

3
libavfilter/vf_blend.c
View File

@ -453,8 +453,6 @@ static const AVFilterPad blend_outputs[] = {
{ NULL } { NULL }
}; };
static const char *const shorthand[] = { NULL };
AVFilter avfilter_vf_blend = { AVFilter avfilter_vf_blend = {
.name = "blend", .name = "blend",
.description = NULL_IF_CONFIG_SMALL("Blend two video frames into each other."), .description = NULL_IF_CONFIG_SMALL("Blend two video frames into each other."),
@ -465,5 +463,4 @@ AVFilter avfilter_vf_blend = {
.inputs = blend_inputs, .inputs = blend_inputs,
.outputs = blend_outputs, .outputs = blend_outputs,
.priv_class = &blend_class, .priv_class = &blend_class,
.shorthand = shorthand,
}; };