Merge commit 'ee6280ca12696a67535ce2245c77190edc513794'

[ffmpeg] / libavcodec / msvideo1.c

diff --git a/libavcodec/msvideo1.c b/libavcodec/msvideo1.c
index 970c67ce122fbf256c99ecfab5812c8f60ba15e4..e60abeee27d8aaa1b1d3c1e7fc106d8b341e3072 100644 (file)
--- a/libavcodec/msvideo1.c
+++ b/libavcodec/msvideo1.c
@@ -67,6 +67,8 @@ static av_cold int msvideo1_decode_init(AVCodecContext *avctx)
     if (s->avctx->bits_per_coded_sample == 8) {
         s->mode_8bit = 1;
         avctx->pix_fmt = AV_PIX_FMT_PAL8;
+        if (avctx->extradata_size >= AVPALETTE_SIZE)
+            memcpy(s->pal, avctx->extradata, AVPALETTE_SIZE);
     } else {
         s->mode_8bit = 0;
         avctx->pix_fmt = AV_PIX_FMT_RGB555;