Commit 72abce3c authored by Jean Delvare's avatar Jean Delvare Committed by Michael Niedermayer

lavfi/delogo: option show shouldn't affect band

Options "show" and "band" are unrelated and should thus be
independent. However, setting "show" to 1 currently resets "band" to
its default value of 4. While this is documented, this still
surprising and confusing IMHO.

Change this behavior and make "show" and "band" independent from each
other. Update the documentation accordingly.
Signed-off-by: 's avatarJean Delvare <khali@linux-fr.org>
Reviewed-by: 's avatarStefano Sabatini <stefasab@gmail.com>
Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent 413f865a
...@@ -2780,8 +2780,8 @@ Specify the thickness of the fuzzy edge of the rectangle (added to ...@@ -2780,8 +2780,8 @@ Specify the thickness of the fuzzy edge of the rectangle (added to
@item show @item show
When set to 1, a green rectangle is drawn on the screen to simplify When set to 1, a green rectangle is drawn on the screen to simplify
finding the right @var{x}, @var{y}, @var{w}, @var{h} parameters, and finding the right @var{x}, @var{y}, @var{w}, and @var{h} parameters.
@var{band} is set to 4. The default value is 0. The default value is 0.
@end table @end table
......
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
#define LIBAVFILTER_VERSION_MAJOR 3 #define LIBAVFILTER_VERSION_MAJOR 3
#define LIBAVFILTER_VERSION_MINOR 78 #define LIBAVFILTER_VERSION_MINOR 78
#define LIBAVFILTER_VERSION_MICRO 100 #define LIBAVFILTER_VERSION_MICRO 101
#define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \ #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \
LIBAVFILTER_VERSION_MINOR, \ LIBAVFILTER_VERSION_MINOR, \
......
...@@ -195,10 +195,8 @@ static av_cold int init(AVFilterContext *ctx) ...@@ -195,10 +195,8 @@ static av_cold int init(AVFilterContext *ctx)
CHECK_UNSET_OPT(w); CHECK_UNSET_OPT(w);
CHECK_UNSET_OPT(h); CHECK_UNSET_OPT(h);
if (s->band < 0 || s->show) { if (s->band < 0)
s->show = 1;
s->band = 4; s->band = 4;
}
av_log(ctx, AV_LOG_VERBOSE, "x:%d y:%d, w:%d h:%d band:%d show:%d\n", av_log(ctx, AV_LOG_VERBOSE, "x:%d y:%d, w:%d h:%d band:%d show:%d\n",
s->x, s->y, s->w, s->h, s->band, s->show); s->x, s->y, s->w, s->h, s->band, s->show);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment