diff options
| author | Clément Bœsch <ubitux@gmail.com> | 2013-04-10 22:33:41 +0200 |
|---|---|---|
| committer | Clément Bœsch <ubitux@gmail.com> | 2013-04-10 23:16:03 +0200 |
| commit | f8eabab04d1b429bc0332c06a46ae3c344a4cb15 (patch) | |
| tree | b5647cf45d2fd2f5fffcbf7b9330df570771ed76 | |
| parent | 1cdb9f48dbc3601fc9ba007d344a7cd45da094d4 (diff) | |
| download | ffmpeg-f8eabab04d1b429bc0332c06a46ae3c344a4cb15.tar.gz | |
lavfi/geq: 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_geq.c | 3 |
3 files changed, 2 insertions, 8 deletions
diff --git a/doc/filters.texi b/doc/filters.texi index 01380bc3f7..00a804a4b1 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -3302,11 +3302,7 @@ For more information see: @section geq -The filter takes one, two, three or four equations as parameter, separated by ':'. -The first equation is mandatory and applies to the luma plane. The two -following are respectively for chroma blue and chroma red planes. - -The filter syntax allows named parameters: +The filter accepts the following options: @table @option @item lum_expr diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index b631326e00..cd47f47d39 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -673,6 +673,7 @@ int avfilter_init_filter(AVFilterContext *filter, const char *args, void *opaque !strcmp(filter->filter->name, "fps" ) || !strcmp(filter->filter->name, "frei0r" ) || !strcmp(filter->filter->name, "frei0r_src") || + !strcmp(filter->filter->name, "geq" ) || !strcmp(filter->filter->name, "gradfun" ) || !strcmp(filter->filter->name, "hqdn3d" ) || !strcmp(filter->filter->name, "ocv" ) || diff --git a/libavfilter/vf_geq.c b/libavfilter/vf_geq.c index a6b48e1665..64e8e5212f 100644 --- a/libavfilter/vf_geq.c +++ b/libavfilter/vf_geq.c @@ -228,8 +228,6 @@ static const AVFilterPad geq_outputs[] = { { NULL } }; -static const char *const shorthand[] = { "lum_expr", "cb_expr", "cr_expr", "alpha_expr", NULL }; - AVFilter avfilter_vf_geq = { .name = "geq", .description = NULL_IF_CONFIG_SMALL("Apply generic equation to each pixel."), @@ -240,5 +238,4 @@ AVFilter avfilter_vf_geq = { .inputs = geq_inputs, .outputs = geq_outputs, .priv_class = &geq_class, - .shorthand = shorthand, }; |