mirror of https://git.ffmpeg.org/ffmpeg.git
msrle: fix regression causing null ptr dereference
Fixes Ticket1630 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
parent
f9505923a3
commit
58825a18aa
|
@ -106,11 +106,10 @@ static int msrle_decode_frame(AVCodecContext *avctx,
|
||||||
s->frame.palette_has_changed = 1;
|
s->frame.palette_has_changed = 1;
|
||||||
memcpy(s->pal, pal, AVPALETTE_SIZE);
|
memcpy(s->pal, pal, AVPALETTE_SIZE);
|
||||||
}
|
}
|
||||||
|
/* make the palette available */
|
||||||
|
memcpy(s->frame.data[1], s->pal, AVPALETTE_SIZE);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* make the palette available */
|
|
||||||
memcpy(s->frame.data[1], s->pal, AVPALETTE_SIZE);
|
|
||||||
|
|
||||||
/* FIXME how to correctly detect RLE ??? */
|
/* FIXME how to correctly detect RLE ??? */
|
||||||
if (avctx->height * istride == avpkt->size) { /* assume uncompressed */
|
if (avctx->height * istride == avpkt->size) { /* assume uncompressed */
|
||||||
int linesize = (avctx->width * avctx->bits_per_coded_sample + 7) / 8;
|
int linesize = (avctx->width * avctx->bits_per_coded_sample + 7) / 8;
|
||||||
|
|
Loading…
Reference in New Issue