From: bcoudurier <bcoudurier@9553f0bf-9b14-0410-a0b8-cfaf0461ba5b>
Date: Sun, 10 May 2009 19:10:37 +0000 (+0000)
Subject: check for palette presence, fix crash with QT-BMP.mov, issue #1074
X-Git-Url: https://rtime.felk.cvut.cz/gitweb/frescor/ffmpeg.git/commitdiff_plain/de2240600ec40c12c6f0cead574a9b8cc07a9172

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

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@18785 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
---

diff --git a/libavcodec/msrle.c b/libavcodec/msrle.c
index 0d77e30c5..0b64be12b 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);