[FFmpeg-cvslog] avcodec/jpeglsdec: add cast to silence pointer type warning

Michael Niedermayer git at videolan.org
Sat May 3 23:14:09 CEST 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat May  3 22:54:01 2014 +0200| [0a5cc20d4aace91fdc8c56149bfee1efb726da8c] | committer: Michael Niedermayer

avcodec/jpeglsdec: add cast to silence pointer type warning

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

 libavcodec/jpeglsdec.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/jpeglsdec.c b/libavcodec/jpeglsdec.c
index add7200..fb3762d 100644
--- 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++) {



More information about the ffmpeg-cvslog mailing list