summaryrefslogtreecommitdiff
path: root/libavcodec/dds.c
diff options
context:
space:
mode:
authorVittorio Giovara <vittorio.giovara@gmail.com>2015-07-20 23:47:12 +0100
committerVittorio Giovara <vittorio.giovara@gmail.com>2015-07-22 13:35:44 +0100
commit57214b2f7f9b1ccfd61e232e8989b5ee850f169c (patch)
tree885c57e6b0027e58f43c4e0720db49fca35f90db /libavcodec/dds.c
parentea4d46e72945cba37feb7aa154eb970732f513e4 (diff)
dds: Fix palette decoding
Red and blue channels were decoded in the wrong order. Found-By: ami_stuff
Diffstat (limited to 'libavcodec/dds.c')
-rw-r--r--libavcodec/dds.c10
1 files changed, 7 insertions, 3 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;
}