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

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch <ubitux at gmail.com> | Thu Apr 11 00:40:33 2013 +0200| [e4bd1db88ec05ad389dd4443461ef50a6007b808] | committer: Clément Bœsch

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

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

 doc/filters.texi        |    7 +------
 libavfilter/avfilter.c  |    1 +
 libavfilter/vf_histeq.c |    3 ---
 3 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/doc/filters.texi b/doc/filters.texi
index 72bfce6..490bbb8 100644
--- a/doc/filters.texi
+++ b/doc/filters.texi
@@ -3445,12 +3445,7 @@ viewed as an "automatically adjusting contrast filter". This filter is
 useful only for correcting degraded or poorly captured source
 video.
 
-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 syntax
- at var{strength}:@var{intensity}:@var{antibanding}.
-
-This filter accepts the following named options:
+The filter accepts the following options:
 
 @table @option
 @item strength
diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c
index 036949d..23da529 100644
--- a/libavfilter/avfilter.c
+++ b/libavfilter/avfilter.c
@@ -679,6 +679,7 @@ int avfilter_init_filter(AVFilterContext *filter, const char *args, void *opaque
         !strcmp(filter->filter->name,  "frei0r_src") ||
         !strcmp(filter->filter->name,  "geq"       ) ||
         !strcmp(filter->filter->name, "gradfun"    ) ||
+        !strcmp(filter->filter->name, "histeq"     ) ||
         !strcmp(filter->filter->name, "hqdn3d"     ) ||
         !strcmp(filter->filter->name, "ocv"        ) ||
         !strcmp(filter->filter->name, "life"       ) ||
diff --git a/libavfilter/vf_histeq.c b/libavfilter/vf_histeq.c
index 05e1d59..f4d7795 100644
--- a/libavfilter/vf_histeq.c
+++ b/libavfilter/vf_histeq.c
@@ -269,8 +269,6 @@ static const AVFilterPad histeq_outputs[] = {
     { NULL }
 };
 
-static const char *const shorthand[] = { "strength", "intensity", "antibanding", NULL };
-
 AVFilter avfilter_vf_histeq = {
     .name          = "histeq",
     .description   = NULL_IF_CONFIG_SMALL("Apply global color histogram equalization."),
@@ -281,5 +279,4 @@ AVFilter avfilter_vf_histeq = {
     .inputs        = histeq_inputs,
     .outputs       = histeq_outputs,
     .priv_class    = &histeq_class,
-    .shorthand     = shorthand,
 };