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

[Gyan Doshi]

At present, the value name 'max' for maximum thickness in drawbox (and 
drawgrid) filter leads to a parse error if the thickness expression 
contains 'max(val1,val2)' i.e.

     [Eval @ ...] Invalid chars '(20,30)' at the end of expression 
'max(20,30)'

Renamed to 'fill'; tested & documented.

Regards,
Gyan
-------------- next part --------------
From 3d8d9a35a15f9588ef660abff47c0410371985f3 Mon Sep 17 00:00:00 2001
From: Gyan Doshi <gyandoshi at gmail.com>
Date: Mon, 20 Nov 2017 15:36:39 +0530
Subject: [PATCH] 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.
---
 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 63ce899784..3c69546bf3 100644
--- a/doc/filters.texi
+++ b/doc/filters.texi
@@ -7086,7 +7086,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
@@ -7149,7 +7150,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
 };
 
-- 
2.11.1.windows.1