diff options
| author | Clément Bœsch <ubitux@gmail.com> | 2013-04-10 22:18:20 +0200 |
|---|---|---|
| committer | Clément Bœsch <ubitux@gmail.com> | 2013-04-10 23:16:02 +0200 |
| commit | 8da1f1f2081c615852e036f3f8e45eee07ee3bbc (patch) | |
| tree | 3bc3c24e3aa744afbe6ea3cee56be1450180f0b9 | |
| parent | 8388e1e2b343e25b3a7de31079557285b7353ebd (diff) | |
lavfi/colormatrix: switch to an AVOptions-based system.
| -rw-r--r-- | doc/filters.texi | 6 | ||||
| -rw-r--r-- | libavfilter/avfilter.c | 1 | ||||
| -rw-r--r-- | libavfilter/vf_colormatrix.c | 3 |
3 files changed, 2 insertions, 8 deletions
diff --git a/doc/filters.texi b/doc/filters.texi index 796cdce929..d5b7e68c8d 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -2102,12 +2102,8 @@ boxblur=luma_radius=min(h\,w)/10:luma_power=1:chroma_radius=min(cw\,ch)/10:chrom Convert color matrix. -The filter accepts parameters as a list of @var{key}=@var{value} -pairs, separated by ":". If the key of the first options is omitted, -the arguments are interpreted according to the syntax -@var{src}:@var{dst}. +The filter accepts the following options: -A description of the accepted options follows: @table @option @item src @item dst diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index a7d05e47e0..0d76b985ab 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -659,6 +659,7 @@ int avfilter_init_filter(AVFilterContext *filter, const char *args, void *opaque !strcmp(filter->filter->name, "aformat") || !strcmp(filter->filter->name, "blackframe") || !strcmp(filter->filter->name, "boxblur" ) || + !strcmp(filter->filter->name, "colormatrix") || !strcmp(filter->filter->name, "crop" ) || !strcmp(filter->filter->name, "cropdetect") || !strcmp(filter->filter->name, "delogo" ) || diff --git a/libavfilter/vf_colormatrix.c b/libavfilter/vf_colormatrix.c index c57be41559..a161c81809 100644 --- a/libavfilter/vf_colormatrix.c +++ b/libavfilter/vf_colormatrix.c @@ -375,8 +375,6 @@ static const AVFilterPad colormatrix_outputs[] = { { NULL } }; -static const char *const shorthand[] = { "src", "dst", NULL }; - AVFilter avfilter_vf_colormatrix = { .name = "colormatrix", .description = NULL_IF_CONFIG_SMALL("Convert color matrix."), @@ -387,5 +385,4 @@ AVFilter avfilter_vf_colormatrix = { .inputs = colormatrix_inputs, .outputs = colormatrix_outputs, .priv_class = &colormatrix_class, - .shorthand = shorthand, }; |