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/gdv.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/gdv.c')
| -rw-r--r-- | libavcodec/gdv.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/libavcodec/gdv.c b/libavcodec/gdv.c index 860634c9ec..406d79df01 100644 --- a/libavcodec/gdv.c +++ b/libavcodec/gdv.c @@ -23,6 +23,7 @@ #include "libavutil/common.h" #include "avcodec.h" #include "bytestream.h" +#include "decode.h" #include "internal.h" typedef struct GDVContext { @@ -462,8 +463,6 @@ static int gdv_decode_frame(AVCodecContext *avctx, void *data, PutByteContext *pb = &gdv->pb; AVFrame *frame = data; int ret, i; - buffer_size_t pal_size; - const uint8_t *pal = av_packet_get_side_data(avpkt, AV_PKT_DATA_PALETTE, &pal_size); int compression; unsigned flags; uint8_t *dst; @@ -479,8 +478,7 @@ static int gdv_decode_frame(AVCodecContext *avctx, void *data, if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) return ret; - if (pal && pal_size == AVPALETTE_SIZE) - memcpy(gdv->pal, pal, AVPALETTE_SIZE); + ff_copy_palette(gdv->pal, avpkt, avctx); if (compression < 2 && bytestream2_get_bytes_left(gb) < 256*3) return AVERROR_INVALIDDATA; |