[FFmpeg-cvslog] Set some Pictor/PC Paint palettes opaque.

Carl Eugen Hoyos git at videolan.org
Sun Nov 13 03:09:30 CET 2011


ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos at ag.or.at> | Sun Nov 13 03:08:25 2011 +0100| [7ea77a61979612488d6058a35b1af16fde9c4ffb] | committer: Carl Eugen Hoyos

Set some Pictor/PC Paint palettes opaque.

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

 libavcodec/pictordec.c |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/libavcodec/pictordec.c b/libavcodec/pictordec.c
index 2bbb636..ae6e488 100644
--- a/libavcodec/pictordec.c
+++ b/libavcodec/pictordec.c
@@ -175,13 +175,15 @@ static int decode_frame(AVCodecContext *avctx,
             palette[i] = ff_ega_palette[ FFMIN(buf[i], 63)];
     } else if (etype == 4 || etype == 5) {
         npal = FFMIN(esize / 3, 256);
-        for (i = 0; i < npal; i++)
+        for (i = 0; i < npal; i++) {
             palette[i] = AV_RB24(buf + i*3) << 2;
+            palette[i] |= 0xFF << 24;
+        }
     } else {
         if (bpp == 1) {
             npal = 2;
-            palette[0] = 0x000000;
-            palette[1] = 0xFFFFFF;
+            palette[0] = 0xFF000000;
+            palette[1] = 0xFFFFFFFF;
         } else if (bpp == 2) {
             npal = 4;
             for (i = 0; i < npal; i++)



More information about the ffmpeg-cvslog mailing list