Small fix. -- Mats Peterson http://matsp888.no-ip.org/~mats/
>From d292ac7030c5e46eb92a1dd13ace1a000c0fb16f Mon Sep 17 00:00:00 2001 From: Mats Peterson <matsp...@yahoo.com> Date: Sun, 14 Feb 2016 08:11:27 +0100 Subject: [PATCH 2/2 v3] lavc/rawdec: Retrieve nut palette in packets
--- libavcodec/rawdec.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/libavcodec/rawdec.c b/libavcodec/rawdec.c index 10bca05..d998f8e 100644 --- a/libavcodec/rawdec.c +++ b/libavcodec/rawdec.c @@ -365,7 +365,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); @@ -375,6 +374,14 @@ 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; + vid_size = (vid_size + 3) & ~3; + if (avpkt->size - vid_size) { + pal = avpkt->data + vid_size; + memcpy(context->palette->data, pal, avpkt->size - vid_size); + frame->palette_has_changed = 1; + } } } -- 1.7.10.4
_______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel