[FFmpeg-cvslog] Make MSS1 palette opaque.

Carl Eugen Hoyos git at videolan.org
Mon Jun 25 21:16:33 CEST 2012


ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos at ag.or.at> | Mon Jun 25 21:16:06 2012 +0200| [bec21ce7f4900112cdfb43717b0549881b5247d2] | committer: Carl Eugen Hoyos

Make MSS1 palette opaque.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=bec21ce7f4900112cdfb43717b0549881b5247d2
---

 libavcodec/mss1.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavcodec/mss1.c b/libavcodec/mss1.c
index 347990d..b9e3233 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;
 



More information about the ffmpeg-cvslog mailing list