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/decode.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/decode.c')
-rw-r--r-- | libavcodec/decode.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/libavcodec/decode.c b/libavcodec/decode.c index 390147908d..0956a6ac6f 100644 --- a/libavcodec/decode.c +++ b/libavcodec/decode.c @@ -2091,3 +2091,17 @@ FF_ENABLE_DEPRECATION_WARNINGS return 0; } + +int ff_copy_palette(void *dst, const AVPacket *src, void *logctx) +{ + buffer_size_t size; + const void *pal = av_packet_get_side_data(src, AV_PKT_DATA_PALETTE, &size); + + if (pal && size == AVPALETTE_SIZE) { + memcpy(dst, pal, AVPALETTE_SIZE); + return 1; + } else if (pal) { + av_log(logctx, AV_LOG_ERROR, "Palette size %d is wrong\n", size); + } + return 0; +} |