[FFmpeg-cvslog] lavfi/drawbox: add "width" and "height" aliases for "w" and "h" options

[Stefano Sabatini]

ffmpeg | branch: master | Stefano Sabatini <stefasab at gmail.com> | Wed Oct 31 12:25:33 2012 +0100| [9d478f38cd260ad517a1daad17bae7e68a5ace3a] | committer: Stefano Sabatini

lavfi/drawbox: add "width" and "height" aliases for "w" and "h" options

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9d478f38cd260ad517a1daad17bae7e68a5ace3a
---

 doc/filters.texi         |    3 ++-
 libavfilter/version.h    |    2 +-
 libavfilter/vf_drawbox.c |    4 +++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/doc/filters.texi b/doc/filters.texi
index 8bb7a9e..1d6cea9 100644
--- a/doc/filters.texi
+++ b/doc/filters.texi
@@ -1735,7 +1735,8 @@ The description of the accepted parameters follows.
 @item x, y
 Specify the top left corner coordinates of the box. Default to 0.
 
- at item width, height
+ at item width, w
+ at item height, h
 Specify the width and height of the box, if 0 they are interpreted as
 the input width and height. Default to 0.
 
diff --git a/libavfilter/version.h b/libavfilter/version.h
index d14097c..19bf4b5 100644
--- a/libavfilter/version.h
+++ b/libavfilter/version.h
@@ -30,7 +30,7 @@
 
 #define LIBAVFILTER_VERSION_MAJOR  3
 #define LIBAVFILTER_VERSION_MINOR  21
-#define LIBAVFILTER_VERSION_MICRO 103
+#define LIBAVFILTER_VERSION_MICRO 104
 
 #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \
                                                LIBAVFILTER_VERSION_MINOR, \
diff --git a/libavfilter/vf_drawbox.c b/libavfilter/vf_drawbox.c
index b37a35c..ecedb21 100644
--- a/libavfilter/vf_drawbox.c
+++ b/libavfilter/vf_drawbox.c
@@ -51,8 +51,10 @@ typedef struct {
 static const AVOption drawbox_options[] = {
     { "x",           "set the box top-left corner x position", OFFSET(x), AV_OPT_TYPE_INT, {.i64=0}, INT_MIN, INT_MAX, FLAGS },
     { "y",           "set the box top-left corner y position", OFFSET(y), AV_OPT_TYPE_INT, {.i64=0}, INT_MIN, INT_MAX, FLAGS },
+    { "width",       "set the box width",  OFFSET(w), AV_OPT_TYPE_INT, {.i64=0}, 0, INT_MAX, FLAGS },
     { "w",           "set the box width",  OFFSET(w), AV_OPT_TYPE_INT, {.i64=0}, 0, INT_MAX, FLAGS },
-    { "h",           "set the box heigth", OFFSET(h), AV_OPT_TYPE_INT, {.i64=0}, 0, INT_MAX, FLAGS },
+    { "height",      "set the box height", OFFSET(h), AV_OPT_TYPE_INT, {.i64=0}, 0, INT_MAX, FLAGS },
+    { "h",           "set the box height", OFFSET(h), AV_OPT_TYPE_INT, {.i64=0}, 0, INT_MAX, FLAGS },
     { "color",       "set the box edge color", OFFSET(color_str), AV_OPT_TYPE_STRING, {.str="black"}, CHAR_MIN, CHAR_MAX, FLAGS },
     { "c",           "set the box edge color", OFFSET(color_str), AV_OPT_TYPE_STRING, {.str="black"}, CHAR_MIN, CHAR_MAX, FLAGS },
     { "thickness",   "set the box maximum thickness", OFFSET(thickness), AV_OPT_TYPE_INT, {.i64=4}, 0, INT_MAX, FLAGS },