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

pull/21/head
Clément Bœsch 12 years ago
parent 1cdb9f48db
commit f8eabab04d
  1. 6
      doc/filters.texi
  2. 1
      libavfilter/avfilter.c
  3. 3
      libavfilter/vf_geq.c

@ -3302,11 +3302,7 @@ For more information see:
@section geq @section geq
The filter takes one, two, three or four equations as parameter, separated by ':'. The filter accepts the following options:
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:
@table @option @table @option
@item lum_expr @item lum_expr

@ -673,6 +673,7 @@ int avfilter_init_filter(AVFilterContext *filter, const char *args, void *opaque
!strcmp(filter->filter->name, "fps" ) || !strcmp(filter->filter->name, "fps" ) ||
!strcmp(filter->filter->name, "frei0r" ) || !strcmp(filter->filter->name, "frei0r" ) ||
!strcmp(filter->filter->name, "frei0r_src") || !strcmp(filter->filter->name, "frei0r_src") ||
!strcmp(filter->filter->name, "geq" ) ||
!strcmp(filter->filter->name, "gradfun" ) || !strcmp(filter->filter->name, "gradfun" ) ||
!strcmp(filter->filter->name, "hqdn3d" ) || !strcmp(filter->filter->name, "hqdn3d" ) ||
!strcmp(filter->filter->name, "ocv" ) || !strcmp(filter->filter->name, "ocv" ) ||

@ -228,8 +228,6 @@ static const AVFilterPad geq_outputs[] = {
{ NULL } { NULL }
}; };
static const char *const shorthand[] = { "lum_expr", "cb_expr", "cr_expr", "alpha_expr", NULL };
AVFilter avfilter_vf_geq = { AVFilter avfilter_vf_geq = {
.name = "geq", .name = "geq",
.description = NULL_IF_CONFIG_SMALL("Apply generic equation to each pixel."), .description = NULL_IF_CONFIG_SMALL("Apply generic equation to each pixel."),
@ -240,5 +238,4 @@ AVFilter avfilter_vf_geq = {
.inputs = geq_inputs, .inputs = geq_inputs,
.outputs = geq_outputs, .outputs = geq_outputs,
.priv_class = &geq_class, .priv_class = &geq_class,
.shorthand = shorthand,
}; };

Loading…
Cancel
Save