[SCM] libav/experimental: remove a memcpy

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 16:15:29 UTC 2013


The following commit has been merged in the experimental branch:
commit bd58e7f730b45e893df2065cd1cf7af3b545e2bf
Author: Loren Merritt <lorenm at u.washington.edu>
Date:   Mon Feb 25 05:46:53 2008 +0000

    remove a memcpy
    
    Originally committed as revision 12193 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/pngdec.c b/libavcodec/pngdec.c
index 1afadd9..abff1da 100644
--- a/libavcodec/pngdec.c
+++ b/libavcodec/pngdec.c
@@ -262,8 +262,8 @@ static void png_handle_row(PNGDecContext *s)
         if (s->color_type == PNG_COLOR_TYPE_RGB_ALPHA) {
             png_filter_row(&s->dsp, s->tmp_row, s->crow_buf[0], s->crow_buf + 1,
                            s->last_row, s->row_size, s->bpp);
-            memcpy(s->last_row, s->tmp_row, s->row_size);
             convert_to_rgb32(ptr, s->tmp_row, s->width);
+            FFSWAP(uint8_t*, s->last_row, s->tmp_row);
         } else {
             /* in normal case, we avoid one copy */
             if (s->y == 0)
@@ -289,7 +289,7 @@ static void png_handle_row(PNGDecContext *s)
                     break;
                 png_filter_row(&s->dsp, s->tmp_row, s->crow_buf[0], s->crow_buf + 1,
                                s->last_row, s->pass_row_size, s->bpp);
-                memcpy(s->last_row, s->tmp_row, s->pass_row_size);
+                FFSWAP(uint8_t*, s->last_row, s->tmp_row);
                 got_line = 1;
             }
             if ((png_pass_dsp_ymask[s->pass] << (s->y & 7)) & 0x80) {

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list