[FFmpeg-devel] [PATCH 4/4 v2] lavfi/delogo: band width must be at least 1

[Jean Delvare]

We need at least one pixel around the logo to use as known points to
interpolate from. So properly declare the band/t attribute has having
a minimum value of 1.

Signed-off-by: Jean Delvare <khali at linux-fr.org>
---
Changes since v1:
 * Bumped version micro.

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

--- ffmpeg.orig/libavfilter/vf_delogo.c	2013-07-05 14:12:01.855397782 +0200
+++ ffmpeg/libavfilter/vf_delogo.c	2013-07-05 14:12:13.863397960 +0200
@@ -160,8 +160,8 @@ static const AVOption delogo_options[]=
     { "y",    "set logo y position",       OFFSET(y),    AV_OPT_TYPE_INT, { .i64 = -1 }, -1, INT_MAX, FLAGS },
     { "w",    "set logo width",            OFFSET(w),    AV_OPT_TYPE_INT, { .i64 = -1 }, -1, INT_MAX, FLAGS },
     { "h",    "set logo height",           OFFSET(h),    AV_OPT_TYPE_INT, { .i64 = -1 }, -1, INT_MAX, FLAGS },
-    { "band", "set delogo area band size", OFFSET(band), AV_OPT_TYPE_INT, { .i64 =  4 }, -1, INT_MAX, FLAGS },
-    { "t",    "set delogo area band size", OFFSET(band), AV_OPT_TYPE_INT, { .i64 =  4 }, -1, INT_MAX, FLAGS },
+    { "band", "set delogo area band size", OFFSET(band), AV_OPT_TYPE_INT, { .i64 =  4 },  1, INT_MAX, FLAGS },
+    { "t",    "set delogo area band size", OFFSET(band), AV_OPT_TYPE_INT, { .i64 =  4 },  1, INT_MAX, FLAGS },
     { "show", "show delogo area",          OFFSET(show), AV_OPT_TYPE_INT, { .i64 =  0 },  0, 1,       FLAGS },
     { NULL },
 };
@@ -195,9 +195,6 @@ static av_cold int init(AVFilterContext
     CHECK_UNSET_OPT(w);
     CHECK_UNSET_OPT(h);
 
-    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/libavfilter/version.h	2013-07-05 13:43:41.394703258 +0200
+++ ffmpeg/libavfilter/version.h	2013-07-05 14:12:47.080398453 +0200
@@ -31,7 +31,7 @@
 
 #define LIBAVFILTER_VERSION_MAJOR  3
 #define LIBAVFILTER_VERSION_MINOR  78
-#define LIBAVFILTER_VERSION_MICRO 101
+#define LIBAVFILTER_VERSION_MICRO 102
 
 #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \
                                                LIBAVFILTER_VERSION_MINOR, \

-- 
Jean Delvare