Commit 58825a18 authored by Michael Niedermayer's avatar Michael Niedermayer

msrle: fix regression causing null ptr dereference

Fixes Ticket1630
Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent f9505923
......@@ -106,11 +106,10 @@ static int msrle_decode_frame(AVCodecContext *avctx,
s->frame.palette_has_changed = 1;
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 ??? */
if (avctx->height * istride == avpkt->size) { /* assume uncompressed */
int linesize = (avctx->width * avctx->bits_per_coded_sample + 7) / 8;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment