[SCM] libav/experimental: swscale: fix some undefined signed left shifts

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 20c38c9c18b75e62f6c489d9b95bea88efdf3915
Author: Justin Ruggles <justin.ruggles at gmail.com>
Date:   Sat Apr 5 14:46:22 2014 -0400

    swscale: fix some undefined signed left shifts
    
    Based on a patch by Michael Niedermayer <michaelni at gmx.at>

diff --git a/libswscale/swscale_unscaled.c b/libswscale/swscale_unscaled.c
index daa6f5f..9e50d48 100644
--- a/libswscale/swscale_unscaled.c
+++ b/libswscale/swscale_unscaled.c
@@ -1230,13 +1230,13 @@ int attribute_align_arg sws_scale(struct SwsContext *c,
 #if HAVE_BIGENDIAN
             case AV_PIX_FMT_BGR24:
 #endif
-                c->pal_rgb[i] = (r + (g << 8) + (b << 16)) << 8;
+                c->pal_rgb[i] = (r << 8) + (g << 16) + ((unsigned)b << 24);
                 break;
             case AV_PIX_FMT_RGB32_1:
 #if HAVE_BIGENDIAN
             case AV_PIX_FMT_RGB24:
 #endif
-                c->pal_rgb[i] = (b + (g << 8) + (r << 16)) << 8;
+                c->pal_rgb[i] = (b << 8) + (g << 16) + ((unsigned)r << 24);
                 break;
             case AV_PIX_FMT_RGB32:
 #if !HAVE_BIGENDIAN

-- 
Libav/FFmpeg packaging