1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00

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 <jdelvare@suse.de>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Jean Delvare 2015-12-14 11:23:05 +01:00 committed by Michael Niedermayer
parent 758be45756
commit 932cbc846f

View File

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