Commit a7e56229 authored by Baptiste Coudurier's avatar Baptiste Coudurier

check for palette presence, fix crash with QT-BMP.mov, issue #1074

Originally committed as revision 18785 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 841b45e5
......@@ -79,12 +79,14 @@ static int msrle_decode_frame(AVCodecContext *avctx,
return -1;
}
if (s->avctx->palctrl) {
/* make the palette available */
memcpy(s->frame.data[1], s->avctx->palctrl->palette, AVPALETTE_SIZE);
if (s->avctx->palctrl->palette_changed) {
s->frame.palette_has_changed = 1;
s->avctx->palctrl->palette_changed = 0;
}
}
ff_msrle_decode(avctx, (AVPicture*)&s->frame, avctx->bits_per_coded_sample, buf, buf_size);
......
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