[FFmpeg-cvslog] vf_delogo: fix copying the input frame.

[Anton Khirnov]

ffmpeg | branch: release/1.1 | Anton Khirnov <anton at khirnov.net> | Mon Jan 21 21:48:49 2013 +0100| [5bee21d724dc47d115faae3f5065a6db74e1594a] | committer: Reinhard Tartler

vf_delogo: fix copying the input frame.

CC:libav-stable at libav.org
(cherry picked from commit 7194330bcd6db8dc5c22e0c162a0992d519307f9)

Signed-off-by: Reinhard Tartler <siretart at tauware.de>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5bee21d724dc47d115faae3f5065a6db74e1594a
---

 libavfilter/vf_delogo.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/libavfilter/vf_delogo.c b/libavfilter/vf_delogo.c
index 5d56444..af479c2 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,