summaryrefslogtreecommitdiff
path: root/libavcodec/mss1.c
diff options
context:
space:
mode:
authorCarl Eugen Hoyos <cehoyos@ag.or.at>2012-06-25 21:16:06 +0200
committerCarl Eugen Hoyos <cehoyos@ag.or.at>2012-06-25 21:16:06 +0200
commitbec21ce7f4900112cdfb43717b0549881b5247d2 (patch)
tree2bdaf1e0ba41f5696a938cdf3aafe334b049cb82 /libavcodec/mss1.c
parentebfcd6049facf332dab520b2e7655edd1dfce1ed (diff)
Make MSS1 palette opaque.
Diffstat (limited to 'libavcodec/mss1.c')
-rw-r--r--libavcodec/mss1.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/mss1.c b/libavcodec/mss1.c
index 347990d77a..b9e32331ab 100644
--- a/libavcodec/mss1.c
+++ b/libavcodec/mss1.c
@@ -554,7 +554,7 @@ static int decode_pal(MSS1Context *ctx, ArithCoder *acoder)
r = arith_get_bits(acoder, 8);
g = arith_get_bits(acoder, 8);
b = arith_get_bits(acoder, 8);
- *pal++ = (r << 16) | (g << 8) | b;
+ *pal++ = (0xFF << 24) | (r << 16) | (g << 8) | b;
}
return 0;
@@ -803,7 +803,7 @@ static av_cold int mss1_decode_init(AVCodecContext *avctx)
av_int2float(AV_RB32(avctx->extradata + 44)));
for (i = 0; i < 256; i++)
- c->pal[i] = AV_RB24(avctx->extradata + 52 + i * 3);
+ c->pal[i] = 0xFF << 24 | AV_RB24(avctx->extradata + 52 + i * 3);
avctx->pix_fmt = PIX_FMT_PAL8;