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

Originally committed as revision 18785 to svn://svn.ffmpeg.org/ffmpeg/trunk

1 files changed, 2 insertions, 0 deletions

diff --git a/libavcodec/msrle.c b/libavcodec/msrle.c
index 0d77e30c5e..0b64be12bb 100644
--- a/libavcodec/msrle.c
+++ b/libavcodec/msrle.c
@@ -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);