highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dds: Fix palette decoding

Browse Source 
Red and blue channels were decoded in the wrong order.

Found-By: ami_stuff
This commit is contained in:
Vittorio Giovara
2015-07-20 23:47:12 +01:00
parent ea4d46e729
commit 57214b2f7f
3 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
libavcodec/dds.c
View File

@@ -645,11 +645,15 @@ static int dds_decode(AVCodecContext *avctx, void *data,
if (ctx->paletted) { if (ctx->paletted) {
int i; 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. */ /* Use the first 1024 bytes as palette, then copy the rest. */
for (i = 0; i < 256; i++) for (i = 0; i < 256; i++) {
p[i] = bytestream2_get_le32(gbc); 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; frame->palette_has_changed = 1;
} }

2
tests/ref/fate/dds-pal
View File

@@ -1,2 +1,2 @@
#tb 0: 1/25 #tb 0: 1/25
0, 0, 0, 1, 65536, 0xbffee5cd 0, 0, 0, 1, 65536, 0x4287e5cd

2
tests/ref/fate/dds-pal-ati
View File

@@ -1,2 +1,2 @@
#tb 0: 1/25 #tb 0: 1/25
0, 0, 0, 1, 16384, 0x23068060 0, 0, 0, 1, 16384, 0x6ac18060