git.videolan.org
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
6b79ef0
)
avcodec/jpeglsdec: add cast to silence pointer type warning
author
Michael Niedermayer
<michaelni@gmx.at>
Sat, 3 May 2014 20:54:01 +0000
(22:54 +0200)
committer
Michael Niedermayer
<michaelni@gmx.at>
Sat, 3 May 2014 20:54:01 +0000
(22:54 +0200)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/jpeglsdec.c
patch
|
blob
|
history
diff --git
a/libavcodec/jpeglsdec.c
b/libavcodec/jpeglsdec.c
index
add7200
..
fb3762d
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++) {