[FFmpeg-cvslog] dds: Fix palette mode on big endian

Luca Barbato git at videolan.org
Wed Jun 24 21:06:59 CEST 2015


ffmpeg | branch: master | Luca Barbato <lu_zero at gentoo.org> | Tue Jun 23 13:48:10 2015 +0100| [4d55484391112a30d16812597b9ad81605af0c24] | committer: Vittorio Giovara

dds: Fix palette mode on big endian

Found-By: Michael Niedermayer <michaelni at gmx.at>
Signed-off-by: Vittorio Giovara <vittorio.giovara at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4d55484391112a30d16812597b9ad81605af0c24
---

 libavcodec/dds.c |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/libavcodec/dds.c b/libavcodec/dds.c
index 9652f27..501057e 100644
--- a/libavcodec/dds.c
+++ b/libavcodec/dds.c
@@ -626,8 +626,13 @@ static int dds_decode(AVCodecContext *avctx, void *data,
         int linesize = av_image_get_linesize(avctx->pix_fmt, frame->width, 0);
 
         if (ctx->paletted) {
+            int i;
+            uint32_t *p = (uint32_t *)frame->data[1];
+
             /* Use the first 1024 bytes as palette, then copy the rest. */
-            bytestream2_get_buffer(gbc, frame->data[1], 256 * 4);
+            for (i = 0; i < 256; i++)
+                p[i] = bytestream2_get_le32(gbc);
+
             frame->palette_has_changed = 1;
         }
 



More information about the ffmpeg-cvslog mailing list