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/tscc.c | |
parent | ab5803553b3932da3227647ae27f2e2795cc5752 (diff) | |
download | ffmpeg-7b100839330ace3b4846ee4a1fc5caf4b8f8a34e.tar.gz |
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/tscc.c')
-rw-r--r-- | libavcodec/tscc.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/libavcodec/tscc.c b/libavcodec/tscc.c index d33639f3a4..f67a910c73 100644 --- a/libavcodec/tscc.c +++ b/libavcodec/tscc.c @@ -38,6 +38,7 @@ #include <stdlib.h> #include "avcodec.h" +#include "decode.h" #include "internal.h" #include "msrledec.h" @@ -72,15 +73,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, int palette_has_changed = 0; if (c->avctx->pix_fmt == AV_PIX_FMT_PAL8) { - buffer_size_t size; - const uint8_t *pal = av_packet_get_side_data(avpkt, AV_PKT_DATA_PALETTE, &size); - - if (pal && size == AVPALETTE_SIZE) { - palette_has_changed = 1; - memcpy(c->pal, pal, AVPALETTE_SIZE); - } else if (pal) { - av_log(avctx, AV_LOG_ERROR, "Palette size %d is wrong\n", size); - } + palette_has_changed = ff_copy_palette(c->pal, avpkt, avctx); } ret = inflateReset(&c->zstream); |