diff options
| author | Justin Ruggles <justin.ruggles@gmail.com> | 2014-04-05 14:46:22 -0400 |
|---|---|---|
| committer | Justin Ruggles <justin.ruggles@gmail.com> | 2014-04-12 13:24:47 -0400 |
| commit | 20c38c9c18b75e62f6c489d9b95bea88efdf3915 (patch) | |
| tree | 81db25d8a4f00211ab4c5a1723f4b0a54813d67a /libswscale | |
| parent | 60c4660ba035bbfbcc84ac34129ce40e037c70ad (diff) | |
| download | ffmpeg-20c38c9c18b75e62f6c489d9b95bea88efdf3915.tar.gz | |
swscale: fix some undefined signed left shifts
Based on a patch by Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale')
| -rw-r--r-- | libswscale/swscale_unscaled.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libswscale/swscale_unscaled.c b/libswscale/swscale_unscaled.c index daa6f5f7c6..9e50d48ac3 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 |