]> git.sesse.net Git - ffmpeg/commitdiff
vf_delogo: fix copying the input frame.
authorAnton Khirnov <anton@khirnov.net>
Mon, 21 Jan 2013 20:48:49 +0000 (21:48 +0100)
committerAnton Khirnov <anton@khirnov.net>
Tue, 29 Jan 2013 06:33:02 +0000 (07:33 +0100)
CC:libav-stable@libav.org

libavfilter/vf_delogo.c

index 5d56444e20432ef94e335dba4cfaaca500ec49e7..af479c2b12f09203743b738a3175ca74a6cf4bd4 100644 (file)
@@ -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,