[FFmpeg-cvslog] lavfi/colormatrix: switch to an AVOptions-based system.

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch <ubitux at gmail.com> | Wed Apr 10 22:18:20 2013 +0200| [8da1f1f2081c615852e036f3f8e45eee07ee3bbc] | committer: Clément Bœsch

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8da1f1f2081c615852e036f3f8e45eee07ee3bbc
---

 doc/filters.texi             |    6 +-----
 libavfilter/avfilter.c       |    1 +
 libavfilter/vf_colormatrix.c |    3 ---
 3 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/doc/filters.texi b/doc/filters.texi
index 796cdce..d5b7e68 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
- at 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 a7d05e4..0d76b98 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 c57be41..a161c81 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,
 };