Merge commit '9580818c5d934bde65a95efd2cee61c174721092'

[ffmpeg] / libavcodec / jpeglsdec.c

diff --git a/libavcodec/jpeglsdec.c b/libavcodec/jpeglsdec.c
index add7200fc1080e65ec71a18bef5311926db6f10b..fb3762dad058993b57bc2b43aaaf2f7b065474bb 100644 (file)
--- a/libavcodec/jpeglsdec.c
+++ b/libavcodec/jpeglsdec.c
@@ -109,7 +109,7 @@ int ff_jpegls_decode_lse(MJpegDecodeContext *s)
 
         if ((s->avctx->pix_fmt == AV_PIX_FMT_GRAY8 || s->avctx->pix_fmt == AV_PIX_FMT_PAL8) &&
             (s->picture_ptr->format == AV_PIX_FMT_GRAY8 || s->picture_ptr->format == AV_PIX_FMT_PAL8)) {
-            uint32_t *pal = s->picture_ptr->data[1];
+            uint32_t *pal = (uint32_t *)s->picture_ptr->data[1];
             s->picture_ptr->format =
             s->avctx->pix_fmt = AV_PIX_FMT_PAL8;
             for (i=s->palette_index; i<=maxtab; i++) {