[SCM] libav/experimental: fix pointer truncation to int in avpicture_layout()

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 8f190d8b835b009374d57ffd257a8198c83e6643
Author: Ramiro Polla <ramiro.polla at gmail.com>
Date:   Mon Nov 22 03:46:31 2010 +0000

    fix pointer truncation to int in avpicture_layout()
    
    Originally committed as revision 25793 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/imgconvert.c b/libavcodec/imgconvert.c
index db71ec4..879532d 100644
--- a/libavcodec/imgconvert.c
+++ b/libavcodec/imgconvert.c
@@ -503,10 +503,10 @@ int avpicture_layout(const AVPicture* src, enum PixelFormat pix_fmt, int width,
 
     av_image_fill_linesizes(linesizes, pix_fmt, width);
     for (i = 0; i < nb_planes; i++) {
-        int h, s = (i == 1 || i == 2) ? desc->log2_chroma_h : 0;
-        h = (height + (1 << s) - 1) >> s;
+        int h, shift = (i == 1 || i == 2) ? desc->log2_chroma_h : 0;
+        const unsigned char *s = src->data[i];
+        h = (height + (1 << shift) - 1) >> shift;
 
-        s = src->data[i];
         for (j = 0; j < h; j++) {
             memcpy(dest, s, linesizes[i]);
             dest += linesizes[i];

-- 
Libav/FFmpeg packaging