History

lavfi/blend: switch to AVOption-based system

Matthieu Bouron committed 13 years ago

Commit 6afed2a1 parent ab6091f3 files · +2 −5Browse files

Unified · Split

3 files
  1. doc/filters.texi +1 −2
  2. libavfilter/avfilter.c +1 −0
  3. libavfilter/vf_blend.c +0 −3
doc/filters.texi+1−2
@@ -1904,8 +1904,7 @@ It takes two input streams and outputs one stream, the first input is the · 1903 unmodified lines
19041904 "top" layer and second input is "bottom" layer.
19051905 Output terminates when shortest input terminates.
19061906
1907−This filter accepts a list of options in the form of @var{key}=@var{value}
1908−pairs separated by ":". A description of the accepted options follows.
1907+A description of the accepted options follows.
19091908
19101909 @table @option
19111910 @item c0_mode
libavfilter/avfilter.c+1−0
@@ -659,6 +659,7 @@ int avfilter_init_filter(AVFilterContext *filter, const char *args, void *opaque · 658 unmodified lines
659659 !strcmp(filter->filter->name, "aformat") ||
660660 !strcmp(filter->filter->name, "ass") ||
661661 !strcmp(filter->filter->name, "blackframe") ||
662+ !strcmp(filter->filter->name, "blend" ) ||
662663 !strcmp(filter->filter->name, "boxblur" ) ||
663664 !strcmp(filter->filter->name, "cellauto") ||
664665 !strcmp(filter->filter->name, "colormatrix") ||
libavfilter/vf_blend.c+0−3
@@ -453,8 +453,6 @@ static const AVFilterPad blend_outputs[] = { · 452 unmodified lines
453453 { NULL }
454454 };
455455
456−static const char *const shorthand[] = { NULL };
457−
458456 AVFilter avfilter_vf_blend = {
459457 .name = "blend",
460458 .description = NULL_IF_CONFIG_SMALL("Blend two video frames into each other."),
@@ -465,5 +463,4 @@ AVFilter avfilter_vf_blend = { · 4 unmodified lines
465463 .inputs = blend_inputs,
466464 .outputs = blend_outputs,
467465 .priv_class = &blend_class,
468− .shorthand = shorthand,
469466 };

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