[FFmpeg-devel] [PATCH 3/4 v2] lavfi/delogo: option show shouldn't affect band

[Jean Delvare]

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>
---
Changes since v1:
 * Reworded the patch description.
 * Moved documentation update to a separate patch (will send later.)
 * Bumped the version micro.

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

--- ffmpeg.orig/libavfilter/vf_delogo.c	2013-07-05 10:30:07.411461086 +0200
+++ ffmpeg/libavfilter/vf_delogo.c	2013-07-05 13:43:31.050703104 +0200
@@ -195,10 +195,8 @@ static av_cold int init(AVFilterContext
     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);
--- ffmpeg.orig/doc/filters.texi	2013-07-05 10:23:36.417215190 +0200
+++ ffmpeg/doc/filters.texi	2013-07-05 13:05:46.271636662 +0200
@@ -2780,8 +2780,8 @@ Specify the thickness of the fuzzy edge
 
 @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
 
--- ffmpeg.orig/libavfilter/version.h	2013-07-05 09:01:09.424696005 +0200
+++ ffmpeg/libavfilter/version.h	2013-07-05 13:43:41.394703258 +0200
@@ -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, \

-- 
Jean Delvare