From: Martin Storsjö <martin@martin.st>
Date: Thu, 23 Jul 2015 14:59:44 +0000 (+0300)
Subject: dds: Write the palette in the native endian form
X-Git-Tag: android-x86-7.1-r1~252^2~2195
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=44f7df0c987965763c609f6dc36974b04182e58d;p=android-x86%2Fexternal-ffmpeg.git

dds: Write the palette in the native endian form

This fixes the palette on big endian, broken (or, differing from
little endian) since 57214b2f7.

Signed-off-by: Martin Storsjö <martin@martin.st>
---

diff --git a/libavcodec/dds.c b/libavcodec/dds.c
index 2c3a2f25b8..f124d4a13d 100644
--- a/libavcodec/dds.c
+++ b/libavcodec/dds.c
@@ -653,14 +653,16 @@ static int dds_decode(AVCodecContext *avctx, void *data,
 
         if (ctx->paletted) {
             int i;
-            uint8_t *p = frame->data[1];
+            uint32_t *p = (uint32_t*) frame->data[1];
 
             /* Use the first 1024 bytes as palette, then copy the rest. */
             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);
+                uint32_t rgba = 0;
+                rgba |= bytestream2_get_byte(gbc) << 16;
+                rgba |= bytestream2_get_byte(gbc) << 8;
+                rgba |= bytestream2_get_byte(gbc) << 0;
+                rgba |= bytestream2_get_byte(gbc) << 24;
+                p[i] = rgba;
             }
 
             frame->palette_has_changed = 1;