dds: Fix palette decoding

Red and blue channels were decoded in the wrong order.

Found-By: ami_stuff

diff --git a/libavcodec/dds.c b/libavcodec/dds.c
index d259b5e0f4cc5ad861ce2d213c0af17882f6dad5..85d85fd9f0faf4328895b5b15811445616429f26 100644 (file)
--- 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 85414414d578a52390b2055cf9aa5aa7c96f80fe..575a4bd51b9050bd7b919dfe49b1ed8d547f43b7 100644 (file)
--- 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 6b43bb4a8b8aaf6911855d3d76d8be464d01b7ae..6de8adb4454137c9ad434a5edb3e6244e98a72d0 100644 (file)
--- 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