diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-14 05:16:59 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-14 05:16:59 +0200 |
| commit | 7a32ab5ed0b0523d1868da8232ff15831712a18f (patch) | |
| tree | 54e0bc787e06402d6705842f304eb9a2d45962fc /libswscale/swscale.c | |
| parent | 693097c355cba3af1cba24e762b8b6d21769076a (diff) | |
| download | ffmpeg-7a32ab5ed0b0523d1868da8232ff15831712a18f.tar.gz | |
sws: get rid of C99 signed overflows try #2
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale/swscale.c')
| -rw-r--r-- | libswscale/swscale.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libswscale/swscale.c b/libswscale/swscale.c index 8b675544f1..37b7712e22 100644 --- a/libswscale/swscale.c +++ b/libswscale/swscale.c @@ -848,33 +848,33 @@ int attribute_align_arg sws_scale(struct SwsContext *c, y = av_clip_uint8((RY * r + GY * g + BY * b + ( 33 << (RGB2YUV_SHIFT - 1))) >> RGB2YUV_SHIFT); u = av_clip_uint8((RU * r + GU * g + BU * b + (257 << (RGB2YUV_SHIFT - 1))) >> RGB2YUV_SHIFT); v = av_clip_uint8((RV * r + GV * g + BV * b + (257 << (RGB2YUV_SHIFT - 1))) >> RGB2YUV_SHIFT); - c->pal_yuv[i]= y + (u<<8) + (v<<16) + (a<<24U); + c->pal_yuv[i]= y + (u<<8) + (v<<16) + ((unsigned)a<<24); switch (c->dstFormat) { case AV_PIX_FMT_BGR32: #if !HAVE_BIGENDIAN case AV_PIX_FMT_RGB24: #endif - c->pal_rgb[i]= r + (g<<8) + (b<<16) + (a<<24U); + c->pal_rgb[i]= r + (g<<8) + (b<<16) + ((unsigned)a<<24); break; case AV_PIX_FMT_BGR32_1: #if HAVE_BIGENDIAN case AV_PIX_FMT_BGR24: #endif - c->pal_rgb[i]= a + (r<<8) + (g<<16) + (b<<24U); + c->pal_rgb[i]= a + (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]= a + (b<<8) + (g<<16) + (r<<24U); + c->pal_rgb[i]= a + (b<<8) + (g<<16) + ((unsigned)r<<24); break; case AV_PIX_FMT_RGB32: #if !HAVE_BIGENDIAN case AV_PIX_FMT_BGR24: #endif default: - c->pal_rgb[i]= b + (g<<8) + (r<<16) + (a<<24U); + c->pal_rgb[i]= b + (g<<8) + (r<<16) + ((unsigned)a<<24); } } } |