From 932cbc846f5574ed6b775a0fd586e70b5c8f84a2 Mon Sep 17 00:00:00 2001 From: Jean Delvare Date: Mon, 14 Dec 2015 11:23:05 +0100 Subject: [PATCH] avfilter/vf_delogo: fix show option when clipping 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 Signed-off-by: Michael Niedermayer --- libavfilter/vf_delogo.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavfilter/vf_delogo.c b/libavfilter/vf_delogo.c index 168af89f90..8058ea901e 100644 --- a/libavfilter/vf_delogo.c +++ b/libavfilter/vf_delogo.c @@ -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; }