aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/dvdsubdec.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-01-12 21:38:19 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-01-12 21:39:00 +0100
commit754dd7e8895543d71b4184c3180d39c0ed735f3a (patch)
tree62f776d4e40c2280a137c9d965f2b56bf3912ded /libavcodec/dvdsubdec.c
parentc8737d348be526d6403856f424a73ad1c81b157f (diff)
downloadffmpeg-754dd7e8895543d71b4184c3180d39c0ed735f3a.tar.gz
dvdsubdec: use unsigned shifts to avoid shifting into the sign bit
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/dvdsubdec.c')
-rw-r--r--libavcodec/dvdsubdec.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/dvdsubdec.c b/libavcodec/dvdsubdec.c
index cc9e11bc92..700655d656 100644
--- a/libavcodec/dvdsubdec.c
+++ b/libavcodec/dvdsubdec.c
@@ -146,7 +146,7 @@ static void guess_palette(uint32_t *rgba_palette,
if(ctx->has_palette) {
for(i = 0; i < 4; i++)
rgba_palette[i] = (ctx->palette[colormap[i]] & 0x00ffffff)
- | ((alpha[i] * 17) << 24);
+ | ((alpha[i] * 17U) << 24);
return;
}