[FFmpeg-cvslog] avcodec/xwddec: fix palette alpha

Marton Balint git at videolan.org
Thu May 17 00:02:26 EEST 2018


ffmpeg | branch: release/4.0 | Marton Balint <cus at passwd.hu> | Sun May  6 18:18:19 2018 +0200| [61fed89ad425128b7f62ae57719c50503f75455a] | committer: Marton Balint

avcodec/xwddec: fix palette alpha

Signed-off-by: Marton Balint <cus at passwd.hu>
(cherry picked from commit 50d6b7bd830eddd403c50f1be3e57f1b4a98ed69)

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

 libavcodec/xwddec.c | 2 +-
 tests/ref/lavf/xwd  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/libavcodec/xwddec.c b/libavcodec/xwddec.c
index 8b0845fc01..592c98dd4e 100644
--- a/libavcodec/xwddec.c
+++ b/libavcodec/xwddec.c
@@ -227,7 +227,7 @@ static int xwd_decode_frame(AVCodecContext *avctx, void *data,
             blue   = bytestream2_get_byteu(&gb);
             bytestream2_skipu(&gb, 3); // skip bitmask flag and padding
 
-            dst[i] = red << 16 | green << 8 | blue;
+            dst[i] = 0xFFU << 24 | red << 16 | green << 8 | blue;
         }
     }
 
diff --git a/tests/ref/lavf/xwd b/tests/ref/lavf/xwd
index 3d638211cb..b263ce6991 100644
--- a/tests/ref/lavf/xwd
+++ b/tests/ref/lavf/xwd
@@ -11,10 +11,10 @@ c0866e9e710fce735423594a93bee604 *./tests/data/images/xwd/02.xwd
 ./tests/data/images/xwd/%02d.xwd CRC=0x14555d6e
 202863 ./tests/data/images/xwd/02.xwd
 c6f3cb7c45f7238474a89d2ad61a1caf *./tests/data/images/xwd/02.xwd
-./tests/data/images/xwd/%02d.xwd CRC=0xfaafb59b
+./tests/data/images/xwd/%02d.xwd CRC=0xf217a95e
 104559 ./tests/data/images/xwd/02.xwd
 fe1af954966a40c2cd35fc27094ff823 *./tests/data/images/xwd/02.xwd
-./tests/data/images/xwd/%02d.xwd CRC=0xd69c3a09
+./tests/data/images/xwd/%02d.xwd CRC=0xce042dcc
 104559 ./tests/data/images/xwd/02.xwd
 85e9b8b814a1dea71d143aac2e487037 *./tests/data/images/xwd/02.xwd
 ./tests/data/images/xwd/%02d.xwd CRC=0x0ff205be



More information about the ffmpeg-cvslog mailing list