aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2013-01-21 21:48:49 +0100
committerReinhard Tartler <siretart@tauware.de>2013-02-07 07:18:56 +0100
commit5bee21d724dc47d115faae3f5065a6db74e1594a (patch)
treea93e930d7a357a811cae7fe0a7a522bae1d471ee
parente835ce83e2ac518fb1227351379f3c8c8cc9066a (diff)
downloadffmpeg-5bee21d724dc47d115faae3f5065a6db74e1594a.tar.gz
vf_delogo: fix copying the input frame.
CC:libav-stable@libav.org (cherry picked from commit 7194330bcd6db8dc5c22e0c162a0992d519307f9) Signed-off-by: Reinhard Tartler <siretart@tauware.de>
-rw-r--r--libavfilter/vf_delogo.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/libavfilter/vf_delogo.c b/libavfilter/vf_delogo.c
index 5d56444e20..af479c2b12 100644
--- a/libavfilter/vf_delogo.c
+++ b/libavfilter/vf_delogo.c
@@ -80,12 +80,12 @@ static void apply_delogo(uint8_t *dst, int dst_linesize,
topright = src+logo_y1 * src_linesize+logo_x2-1;
botleft = src+(logo_y2-1) * src_linesize+logo_x1;
- dst += (logo_y1+1)*dst_linesize;
- src += (logo_y1+1)*src_linesize;
-
if (!direct)
av_image_copy_plane(dst, dst_linesize, src, src_linesize, w, h);
+ dst += (logo_y1 + 1) * dst_linesize;
+ src += (logo_y1 + 1) * src_linesize;
+
for (y = logo_y1+1; y < logo_y2-1; y++) {
for (x = logo_x1+1,
xdst = dst+logo_x1+1,