diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-14 03:59:45 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-14 03:59:45 +0200 |
| commit | 3ee8eefbf2623e1e337df7d962412b0703336431 (patch) | |
| tree | ccb68317e6ad41831b8787595bc2a1cf244589d7 | |
| parent | 555f352f99317b141f109716524b5a2aace91316 (diff) | |
| download | ffmpeg-3ee8eefbf2623e1e337df7d962412b0703336431.tar.gz | |
sws: avoid signed C99 overflows
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -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 f7dc728e27..8b675544f1 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<<24); + c->pal_yuv[i]= y + (u<<8) + (v<<16) + (a<<24U); 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<<24); + c->pal_rgb[i]= r + (g<<8) + (b<<16) + (a<<24U); 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<<24); + c->pal_rgb[i]= a + (r<<8) + (g<<16) + (b<<24U); 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<<24); + c->pal_rgb[i]= a + (b<<8) + (g<<16) + (r<<24U); 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<<24); + c->pal_rgb[i]= b + (g<<8) + (r<<16) + (a<<24U); } } } |