virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-04 06:08:26 +02:00
Code Issues Releases Activity

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

Browse Source 
Originally committed as revision 18785 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Baptiste Coudurier 2009-05-10 19:10:37 +00:00
parent 841b45e55d
commit a7e562291d
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/msrle.c
View File

@ -79,12 +79,14 @@ static int msrle_decode_frame(AVCodecContext *avctx,
return -1; return -1;
} }
if (s->avctx->palctrl) {
/* make the palette available */ /* make the palette available */
memcpy(s->frame.data[1], s->avctx->palctrl->palette, AVPALETTE_SIZE); memcpy(s->frame.data[1], s->avctx->palctrl->palette, AVPALETTE_SIZE);
if (s->avctx->palctrl->palette_changed) { if (s->avctx->palctrl->palette_changed) {
s->frame.palette_has_changed = 1; s->frame.palette_has_changed = 1;
s->avctx->palctrl->palette_changed = 0; s->avctx->palctrl->palette_changed = 0;
} }
}
ff_msrle_decode(avctx, (AVPicture*)&s->frame, avctx->bits_per_coded_sample, buf, buf_size); ff_msrle_decode(avctx, (AVPicture*)&s->frame, avctx->bits_per_coded_sample, buf, buf_size);