From 57214b2f7f9b1ccfd61e232e8989b5ee850f169c Mon Sep 17 00:00:00 2001 From: Vittorio Giovara Date: Mon, 20 Jul 2015 23:47:12 +0100 Subject: [PATCH] dds: Fix palette decoding Red and blue channels were decoded in the wrong order. Found-By: ami_stuff --- libavcodec/dds.c | 10 +++++++--- tests/ref/fate/dds-pal | 2 +- tests/ref/fate/dds-pal-ati | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/libavcodec/dds.c b/libavcodec/dds.c index d259b5e0f4..85d85fd9f0 100644 --- a/libavcodec/dds.c +++ b/libavcodec/dds.c @@ -645,11 +645,15 @@ static int dds_decode(AVCodecContext *avctx, void *data, if (ctx->paletted) { int i; - uint32_t *p = (uint32_t *)frame->data[1]; + uint8_t *p = frame->data[1]; /* Use the first 1024 bytes as palette, then copy the rest. */ - for (i = 0; i < 256; i++) - p[i] = bytestream2_get_le32(gbc); + for (i = 0; i < 256; i++) { + p[i * 4 + 2] = bytestream2_get_byte(gbc); + p[i * 4 + 1] = bytestream2_get_byte(gbc); + p[i * 4 + 0] = bytestream2_get_byte(gbc); + p[i * 4 + 3] = bytestream2_get_byte(gbc); + } frame->palette_has_changed = 1; } diff --git a/tests/ref/fate/dds-pal b/tests/ref/fate/dds-pal index 85414414d5..575a4bd51b 100644 --- a/tests/ref/fate/dds-pal +++ b/tests/ref/fate/dds-pal @@ -1,2 +1,2 @@ #tb 0: 1/25 -0, 0, 0, 1, 65536, 0xbffee5cd +0, 0, 0, 1, 65536, 0x4287e5cd diff --git a/tests/ref/fate/dds-pal-ati b/tests/ref/fate/dds-pal-ati index 6b43bb4a8b..6de8adb445 100644 --- a/tests/ref/fate/dds-pal-ati +++ b/tests/ref/fate/dds-pal-ati @@ -1,2 +1,2 @@ #tb 0: 1/25 -0, 0, 0, 1, 16384, 0x23068060 +0, 0, 0, 1, 16384, 0x6ac18060