From b2d589188f36cc69ffb8148810dc706d82dcebf6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20B=C5=93sch?= Date: Thu, 11 Apr 2013 00:57:35 +0200 Subject: [PATCH] lavfi/histogram: switch to an AVOptions-based system. --- doc/filters.texi | 2 +- libavfilter/avfilter.c | 1 + libavfilter/vf_histogram.c | 3 --- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/doc/filters.texi b/doc/filters.texi index 8616be76d0..001cd50a2e 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -3474,7 +3474,7 @@ Compute and draw a color distribution histogram for the input video. The computed histogram is a representation of distribution of color components in an image. -The filter accepts the following named parameters: +The filter accepts the following options: @table @option @item mode diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index e6d7f05301..e8f836a9a6 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -680,6 +680,7 @@ int avfilter_init_filter(AVFilterContext *filter, const char *args, void *opaque !strcmp(filter->filter->name, "geq" ) || !strcmp(filter->filter->name, "gradfun" ) || !strcmp(filter->filter->name, "histeq" ) || + !strcmp(filter->filter->name, "histogram" ) || !strcmp(filter->filter->name, "hqdn3d" ) || !strcmp(filter->filter->name, "ocv" ) || !strcmp(filter->filter->name, "life" ) || diff --git a/libavfilter/vf_histogram.c b/libavfilter/vf_histogram.c index b9cba6be1a..3c348858a6 100644 --- a/libavfilter/vf_histogram.c +++ b/libavfilter/vf_histogram.c @@ -311,8 +311,6 @@ static const AVFilterPad outputs[] = { { NULL } }; -static const char *const shorthand[] = { NULL }; - AVFilter avfilter_vf_histogram = { .name = "histogram", .description = NULL_IF_CONFIG_SMALL("Compute and draw a histogram."), @@ -321,5 +319,4 @@ AVFilter avfilter_vf_histogram = { .inputs = inputs, .outputs = outputs, .priv_class = &histogram_class, - .shorthand = shorthand, };