From b86ba37096dd5c3c45d10fcd994128f973bfee7f Mon Sep 17 00:00:00 2001 From: Mats Peterson Date: Tue, 16 Feb 2016 11:44:50 +0100 Subject: [PATCH] lavc/rawdec: Retrieve nut palette from packets Signed-off-by: Michael Niedermayer --- libavcodec/rawdec.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/libavcodec/rawdec.c b/libavcodec/rawdec.c index 287be96955..3a2fac3ae4 100644 --- a/libavcodec/rawdec.c +++ b/libavcodec/rawdec.c @@ -384,7 +384,6 @@ static int raw_decode(AVCodecContext *avctx, void *data, int *got_frame, if (avctx->pix_fmt == AV_PIX_FMT_PAL8) { const uint8_t *pal = av_packet_get_side_data(avpkt, AV_PKT_DATA_PALETTE, NULL); - if (pal) { av_buffer_unref(&context->palette); context->palette = av_buffer_alloc(AVPALETTE_SIZE); @@ -394,6 +393,13 @@ static int raw_decode(AVCodecContext *avctx, void *data, int *got_frame, } memcpy(context->palette->data, pal, AVPALETTE_SIZE); frame->palette_has_changed = 1; + } else if (context->is_nut_pal8) { + int vid_size = avctx->width * avctx->height; + if (avpkt->size - vid_size) { + pal = avpkt->data + vid_size; + memcpy(context->palette->data, pal, avpkt->size - vid_size); + frame->palette_has_changed = 1; + } } }