diff options
author | Andreas Rheinhardt <andreas.rheinhardt@gmail.com> | 2021-03-17 22:43:32 +0100 |
---|---|---|
committer | Andreas Rheinhardt <andreas.rheinhardt@gmail.com> | 2021-03-22 02:43:04 +0100 |
commit | 7b100839330ace3b4846ee4a1fc5caf4b8f8a34e (patch) | |
tree | 5743c922bd05a372bfbe733cf7ee482153d8e55d /libavcodec/kmvc.c | |
parent | ab5803553b3932da3227647ae27f2e2795cc5752 (diff) |
avcodec: Factor updating palette out
Because the properties of frames returned from ff_get/reget_buffer
are not reset at all, lots of returned frames had palette_has_changed
wrongly set to 1. This has been changed, too.
Reviewed-by: James Almer <jamrial@gmail.com>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
Diffstat (limited to 'libavcodec/kmvc.c')
-rw-r--r-- | libavcodec/kmvc.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/libavcodec/kmvc.c b/libavcodec/kmvc.c index 0d96139220..cd9e32f443 100644 --- a/libavcodec/kmvc.c +++ b/libavcodec/kmvc.c @@ -29,6 +29,7 @@ #include "avcodec.h" #include "bytestream.h" +#include "decode.h" #include "internal.h" #include "libavutil/common.h" @@ -268,8 +269,6 @@ static int decode_frame(AVCodecContext * avctx, void *data, int *got_frame, int i, ret; int header; int blocksize; - buffer_size_t pal_size; - const uint8_t *pal = av_packet_get_side_data(avpkt, AV_PKT_DATA_PALETTE, &pal_size); bytestream2_init(&ctx->g, avpkt->data, avpkt->size); @@ -304,12 +303,8 @@ static int decode_frame(AVCodecContext * avctx, void *data, int *got_frame, } } - if (pal && pal_size == AVPALETTE_SIZE) { + if (ff_copy_palette(ctx->pal, avpkt, avctx)) frame->palette_has_changed = 1; - memcpy(ctx->pal, pal, AVPALETTE_SIZE); - } else if (pal) { - av_log(avctx, AV_LOG_ERROR, "Palette size %d is wrong\n", pal_size); - } if (ctx->setpal) { ctx->setpal = 0; |