avfilter/vf_delogo: fix show option when clipping
authorJean Delvare <jdelvare@suse.de>
Mon, 14 Dec 2015 10:23:05 +0000 (11:23 +0100)
committerMichael Niedermayer <michael@niedermayer.cc>
Mon, 14 Dec 2015 11:50:46 +0000 (12:50 +0100)
The show option did not take clipping into account, so the borders on
the clipped side wouldn't show up. Fix it.

Signed-off-by: Jean Delvare <jdelvare@suse.de>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
libavfilter/vf_delogo.c

index 168af89..8058ea9 100644 (file)
@@ -101,8 +101,8 @@ static void apply_delogo(uint8_t *dst, int dst_linesize,
              xdst = dst+logo_x1+1,
              xsrc = src+logo_x1+1; x < logo_x2-1; x++, xdst++, xsrc++) {
 
-            if (show && (y == logo_y+1 || y == logo_y+logo_h-2 ||
-                         x == logo_x+1 || x == logo_x+logo_w-2)) {
+            if (show && (y == logo_y1+1 || y == logo_y2-2 ||
+                         x == logo_x1+1 || x == logo_x2-2)) {
                 *xdst = 0;
                 continue;
             }