[FFmpeg-cvslog] avfilter/drawbox: rename variable for maximum thickness

Gyan Doshi git at videolan.org
Tue Nov 28 22:44:22 EET 2017


ffmpeg | branch: master | Gyan Doshi <gyandoshi at gmail.com> | Mon Nov 20 15:54:39 2017 +0530| [b3cb9bd43fa33a8aaf7a63e43f8418975b3bf0de] | committer: Michael Niedermayer

avfilter/drawbox: rename variable for maximum thickness

The present value name for maximum thickness is 'max' which results in a
parse error of any thickness expression containing 'max(val1,val2)'.

Value renamed to 'fill'. Tested locally and documented.

Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

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

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

diff --git a/doc/filters.texi b/doc/filters.texi
index 476f014ac8..4a4efc70c8 100644
--- a/doc/filters.texi
+++ b/doc/filters.texi
@@ -7142,7 +7142,8 @@ value @code{invert} is used, the box edge color is the same as the
 video with inverted luma.
 
 @item thickness, t
-The expression which sets the thickness of the box edge. Default value is @code{3}.
+The expression which sets the thickness of the box edge.
+A value of @code{fill} will create a filled box. Default value is @code{3}.
 
 See below for the list of accepted constants.
 @end table
@@ -7205,7 +7206,7 @@ drawbox=x=10:y=20:w=200:h=60:color=red@@0.5
 @item
 Fill the box with pink color:
 @example
-drawbox=x=10:y=10:w=100:h=100:color=pink@@0.5:t=max
+drawbox=x=10:y=10:w=100:h=100:color=pink@@0.5:t=fill
 @end example
 
 @item
diff --git a/libavfilter/vf_drawbox.c b/libavfilter/vf_drawbox.c
index 88bb9ae5c0..d351846594 100644
--- a/libavfilter/vf_drawbox.c
+++ b/libavfilter/vf_drawbox.c
@@ -47,7 +47,7 @@ static const char *const var_names[] = {
     "h",              ///< height of the rendered box
     "w",              ///< width  of the rendered box
     "t",
-    "max",
+    "fill",
     NULL
 };
 



More information about the ffmpeg-cvslog mailing list