From 2210003b7f5710e01ab3e000fc59723ca93882ff Mon Sep 17 00:00:00 2001
From: Stefano Sabatini <stefasab@gmail.com>
Date: Sun, 19 May 2013 23:24:21 +0200
Subject: [PATCH] lavfi/geq: add aliases for RGB options

---
 doc/filters.texi      | 23 ++++++++++++-----------
 libavfilter/version.h |  2 +-
 libavfilter/vf_geq.c  |  8 +++++++-
 3 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/doc/filters.texi b/doc/filters.texi
index 301887d696..2475e00c34 100644
--- a/doc/filters.texi
+++ b/doc/filters.texi
@@ -4003,27 +4003,28 @@ For more information see:
 The filter accepts the following options:
 
 @table @option
-@item lum_expr
+@item lum_expr, lum
 Set the luminance expression.
-@item cb_expr
+@item cb_expr, cb
 Set the chrominance blue expression.
-@item cr_expr
+@item cr_expr, cr
 Set the chrominance red expression.
-@item alpha_expr
+@item alpha_expr, a
 Set the alpha expression.
-@item r
+@item red_expr, r
 Set the red expression.
-@item g
+@item green_expr, g
 Set the green expression.
-@item b
+@item blue_expr, b
 Set the blue expression.
 @end table
 
-The colorspace is selected according to the specified options. If
-one of the @option{lum_expr}, @option{cb_expr}, or @option{cr_expr}
+The colorspace is selected according to the specified options. If one
+of the @option{lum_expr}, @option{cb_expr}, or @option{cr_expr}
 options is specified, the filter will automatically select a YCbCr
-colorspace. If one of the @option{r}, @option{g}, or @option{b}
-options is specified, it will select an RGB colorspace.
+colorspace. If one of the @option{red_expr}, @option{green_expr}, or
+@option{blue_expr} options is specified, it will select an RGB
+colorspace.
 
 If one of the chrominance expression is not defined, it falls back on the other
 one. If no alpha expression is specified it will evaluate to opaque value.
diff --git a/libavfilter/version.h b/libavfilter/version.h
index f238a9656b..c0f7370ec7 100644
--- a/libavfilter/version.h
+++ b/libavfilter/version.h
@@ -31,7 +31,7 @@
 
 #define LIBAVFILTER_VERSION_MAJOR  3
 #define LIBAVFILTER_VERSION_MINOR  68
-#define LIBAVFILTER_VERSION_MICRO 102
+#define LIBAVFILTER_VERSION_MICRO 103
 
 #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \
                                                LIBAVFILTER_VERSION_MINOR, \
diff --git a/libavfilter/vf_geq.c b/libavfilter/vf_geq.c
index 84ca664f08..2aed5d400e 100644
--- a/libavfilter/vf_geq.c
+++ b/libavfilter/vf_geq.c
@@ -47,12 +47,18 @@ typedef struct {
 
 static const AVOption geq_options[] = {
     { "lum_expr",   "set luminance expression",   OFFSET(expr_str[0]), AV_OPT_TYPE_STRING, {.str=NULL}, CHAR_MIN, CHAR_MAX, FLAGS },
+    { "lum",        "set luminance expression",   OFFSET(expr_str[0]), AV_OPT_TYPE_STRING, {.str=NULL}, CHAR_MIN, CHAR_MAX, FLAGS },
     { "cb_expr",    "set chroma blue expression", OFFSET(expr_str[1]), AV_OPT_TYPE_STRING, {.str=NULL}, CHAR_MIN, CHAR_MAX, FLAGS },
+    { "cb",         "set chroma blue expression", OFFSET(expr_str[1]), AV_OPT_TYPE_STRING, {.str=NULL}, CHAR_MIN, CHAR_MAX, FLAGS },
     { "cr_expr",    "set chroma red expression",  OFFSET(expr_str[2]), AV_OPT_TYPE_STRING, {.str=NULL}, CHAR_MIN, CHAR_MAX, FLAGS },
+    { "cr",         "set chroma red expression",  OFFSET(expr_str[2]), AV_OPT_TYPE_STRING, {.str=NULL}, CHAR_MIN, CHAR_MAX, FLAGS },
     { "alpha_expr", "set alpha expression",       OFFSET(expr_str[3]), AV_OPT_TYPE_STRING, {.str=NULL}, CHAR_MIN, CHAR_MAX, FLAGS },
-
+    { "a",          "set alpha expression",       OFFSET(expr_str[3]), AV_OPT_TYPE_STRING, {.str=NULL}, CHAR_MIN, CHAR_MAX, FLAGS },
+    { "red_expr",   "set red expression",   OFFSET(expr_str[6]), AV_OPT_TYPE_STRING, {.str=NULL}, CHAR_MIN, CHAR_MAX, FLAGS },
     { "r",          "set red expression",   OFFSET(expr_str[6]), AV_OPT_TYPE_STRING, {.str=NULL}, CHAR_MIN, CHAR_MAX, FLAGS },
+    { "green_expr", "set green expression", OFFSET(expr_str[4]), AV_OPT_TYPE_STRING, {.str=NULL}, CHAR_MIN, CHAR_MAX, FLAGS },
     { "g",          "set green expression", OFFSET(expr_str[4]), AV_OPT_TYPE_STRING, {.str=NULL}, CHAR_MIN, CHAR_MAX, FLAGS },
+    { "blue_expr",  "set blue expression",  OFFSET(expr_str[5]), AV_OPT_TYPE_STRING, {.str=NULL}, CHAR_MIN, CHAR_MAX, FLAGS },
     { "b",          "set blue expression",  OFFSET(expr_str[5]), AV_OPT_TYPE_STRING, {.str=NULL}, CHAR_MIN, CHAR_MAX, FLAGS },
     {NULL},
 };