Unified · Split
| @@ -1904,8 +1904,7 @@ It takes two input streams and outputs one stream, the first input is the · 1903 unmodified lines | |||
| 1904 | "top" layer and second input is "bottom" layer. | 1904 | "top" layer and second input is "bottom" layer. |
| 1905 | Output terminates when shortest input terminates. | 1905 | Output terminates when shortest input terminates. |
| 1906 | 1906 | ||
| 1907 | This filter accepts a list of options in the form of @var{key}=@var{value} | 1907 | A description of the accepted options follows. |
| 1908 | pairs separated by ":". A description of the accepted options follows. | ||
| 1909 | 1908 | ||
| 1910 | @table @option | 1909 | @table @option |
| 1911 | @item c0_mode | 1910 | @item c0_mode |
| @@ -659,6 +659,7 @@ int avfilter_init_filter(AVFilterContext *filter, const char *args, void *opaque · 658 unmodified lines | |||
| 659 | !strcmp(filter->filter->name, "aformat") || | 659 | !strcmp(filter->filter->name, "aformat") || |
| 660 | !strcmp(filter->filter->name, "ass") || | 660 | !strcmp(filter->filter->name, "ass") || |
| 661 | !strcmp(filter->filter->name, "blackframe") || | 661 | !strcmp(filter->filter->name, "blackframe") || |
| 662 | !strcmp(filter->filter->name, "blend" ) || | ||
| 662 | !strcmp(filter->filter->name, "boxblur" ) || | 663 | !strcmp(filter->filter->name, "boxblur" ) || |
| 663 | !strcmp(filter->filter->name, "cellauto") || | 664 | !strcmp(filter->filter->name, "cellauto") || |
| 664 | !strcmp(filter->filter->name, "colormatrix") || | 665 | !strcmp(filter->filter->name, "colormatrix") || |
| @@ -453,8 +453,6 @@ static const AVFilterPad blend_outputs[] = { · 452 unmodified lines | |||
| 453 | { NULL } | 453 | { NULL } |
| 454 | }; | 454 | }; |
| 455 | 455 | ||
| 456 | static const char *const shorthand[] = { NULL }; | ||
| 457 | |||
| 458 | AVFilter avfilter_vf_blend = { | 456 | AVFilter avfilter_vf_blend = { |
| 459 | .name = "blend", | 457 | .name = "blend", |
| 460 | .description = NULL_IF_CONFIG_SMALL("Blend two video frames into each other."), | 458 | .description = NULL_IF_CONFIG_SMALL("Blend two video frames into each other."), |
| @@ -465,5 +463,4 @@ AVFilter avfilter_vf_blend = { · 4 unmodified lines | |||
| 465 | .inputs = blend_inputs, | 463 | .inputs = blend_inputs, |
| 466 | .outputs = blend_outputs, | 464 | .outputs = blend_outputs, |
| 467 | .priv_class = &blend_class, | 465 | .priv_class = &blend_class, |
| 468 | .shorthand = shorthand, | ||
| 469 | }; | 466 | }; |