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

diff --git a/doc/filters.texi b/doc/filters.texi
index 01380bc3f7e8ee2e0afc9cc1850e83423893a167..00a804a4b19baacc0fe525814c1a0a04bcdbda16 100644 (file)
--- 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 b631326e0017785a0c61cdd441a138540d6c399f..cd47f47d39999c076934fa29d200852796d3ec44 100644 (file)
--- 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 a6b48e16659b4dbf04d003e935f12f66e965650d..64e8e5212fe8b80f1fe9a8e3c59a995b8af03474 100644 (file)
--- 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,
 };