virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

lavfi/colormatrix: switch to an AVOptions-based system.

Browse Source
This commit is contained in:
Clément Bœsch
2013-04-10 22:18:20 +02:00
parent 8388e1e2b3
commit 8da1f1f208
3 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
doc/filters.texi
View File

@@ -2102,12 +2102,8 @@ boxblur=luma_radius=min(h\,w)/10:luma_power=1:chroma_radius=min(cw\,ch)/10:chrom
Convert color matrix. Convert color matrix.
The filter accepts parameters as a list of @var{key}=@var{value} The filter accepts the following options:
pairs, separated by ":". If the key of the first options is omitted,
the arguments are interpreted according to the syntax
@var{src}:@var{dst}.
A description of the accepted options follows:
@table @option @table @option
@item src @item src
@item dst @item dst

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, "blackframe") || !strcmp(filter->filter->name, "blackframe") ||
!strcmp(filter->filter->name, "boxblur" ) || !strcmp(filter->filter->name, "boxblur" ) ||
!strcmp(filter->filter->name, "colormatrix") ||
!strcmp(filter->filter->name, "crop" ) || !strcmp(filter->filter->name, "crop" ) ||
!strcmp(filter->filter->name, "cropdetect") || !strcmp(filter->filter->name, "cropdetect") ||
!strcmp(filter->filter->name, "delogo" ) || !strcmp(filter->filter->name, "delogo" ) ||

3
libavfilter/vf_colormatrix.c
View File

@@ -375,8 +375,6 @@ static const AVFilterPad colormatrix_outputs[] = {
{ NULL } { NULL }
}; };
static const char *const shorthand[] = { "src", "dst", NULL };
AVFilter avfilter_vf_colormatrix = { AVFilter avfilter_vf_colormatrix = {
.name = "colormatrix", .name = "colormatrix",
.description = NULL_IF_CONFIG_SMALL("Convert color matrix."), .description = NULL_IF_CONFIG_SMALL("Convert color matrix."),
@@ -387,5 +385,4 @@ AVFilter avfilter_vf_colormatrix = {
.inputs = colormatrix_inputs, .inputs = colormatrix_inputs,
.outputs = colormatrix_outputs, .outputs = colormatrix_outputs,
.priv_class = &colormatrix_class, .priv_class = &colormatrix_class,
.shorthand = shorthand,
}; };