OSDN Git Service

avcodec/msvideo1: Fix palette in case of seek before decode
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 28 Feb 2014 12:20:22 +0000 (13:20 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 28 Feb 2014 12:20:22 +0000 (13:20 +0100)
Fixes Ticket3212

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/msvideo1.c

index 970c67c..e60abee 100644 (file)
@@ -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;