[FFmpeg-cvslog] lavfi/delogo: option show shouldn't affect band

[Jean Delvare]

ffmpeg | branch: master | Jean Delvare <khali at linux-fr.org> | Fri Jul  5 14:25:06 2013 +0200| [72abce3c4672afbde52eca0023082254a5cae995] | committer: 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: Jean Delvare <khali at linux-fr.org>
Reviewed-by: Stefano Sabatini <stefasab at gmail.com>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

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

diff --git a/doc/filters.texi b/doc/filters.texi
index f713bb9..e3544b5 100644
--- a/doc/filters.texi
+++ b/doc/filters.texi
@@ -2780,8 +2780,8 @@ Specify the thickness of the fuzzy edge of the rectangle (added to
 
 @item show
 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
- at var{band} is set to 4. The default value is 0.
+finding the right @var{x}, @var{y}, @var{w}, and @var{h} parameters.
+The default value is 0.
 
 @end table
 
diff --git a/libavfilter/version.h b/libavfilter/version.h
index ee94f58..e4dde3a 100644
--- a/libavfilter/version.h
+++ b/libavfilter/version.h
@@ -31,7 +31,7 @@
 
 #define LIBAVFILTER_VERSION_MAJOR  3
 #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, \
                                                LIBAVFILTER_VERSION_MINOR, \
diff --git a/libavfilter/vf_delogo.c b/libavfilter/vf_delogo.c
index 462613d..ed6ceed 100644
--- a/libavfilter/vf_delogo.c
+++ b/libavfilter/vf_delogo.c
@@ -195,10 +195,8 @@ static av_cold int init(AVFilterContext *ctx)
     CHECK_UNSET_OPT(w);
     CHECK_UNSET_OPT(h);
 
-    if (s->band < 0 || s->show) {
-        s->show = 1;
+    if (s->band < 0)
         s->band = 4;
-    }
 
     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);