[SCM] libav/experimental: Fix palette copying in av_picture_copy(). Previous code worked only if linesize[1] == 1, which does not make sense.

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 16:54:22 UTC 2013


The following commit has been merged in the experimental branch:
commit 51ae2142d5ec6c00621f662631b6347bc1b2669c
Author: Vitor Sessak <vitor1001 at gmail.com>
Date:   Tue Nov 10 19:36:58 2009 +0000

    Fix palette copying in av_picture_copy(). Previous code worked only if
    linesize[1] == 1, which does not make sense.
    
    Originally committed as revision 20503 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/imgconvert.c b/libavcodec/imgconvert.c
index a5fcb53..068e933 100644
--- a/libavcodec/imgconvert.c
+++ b/libavcodec/imgconvert.c
@@ -1184,9 +1184,7 @@ void av_picture_copy(AVPicture *dst, const AVPicture *src,
                        src->data[0], src->linesize[0],
                        width, height);
         /* copy the palette */
-        ff_img_copy_plane(dst->data[1], dst->linesize[1],
-                       src->data[1], src->linesize[1],
-                       4, 256);
+        memcpy(dst->data[1], src->data[1], 4*256);
         break;
     }
 }

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list