1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-29 22:00:58 +02:00

avcodec/kmvc: Prefer in-band palette

Fixes decoding of https://samples.ffmpeg.org/V-codecs/KMVC/LOGO2.AVI

Reviewed-by: Tomas Härdin <tjoppen@acc.umu.se>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
This commit is contained in:
Andreas Rheinhardt 2021-03-22 02:14:35 +01:00
parent ea70c39dee
commit fb6a8847ad

View File

@ -275,6 +275,8 @@ static int decode_frame(AVCodecContext * avctx, void *data, int *got_frame,
if ((ret = ff_get_buffer(avctx, frame, 0)) < 0)
return ret;
frame->palette_has_changed = ff_copy_palette(ctx->pal, avpkt, avctx);
header = bytestream2_get_byte(&ctx->g);
/* blocksize 127 is really palette change event */
@ -303,9 +305,6 @@ static int decode_frame(AVCodecContext * avctx, void *data, int *got_frame,
}
}
if (ff_copy_palette(ctx->pal, avpkt, avctx))
frame->palette_has_changed = 1;
if (ctx->setpal) {
ctx->setpal = 0;
frame->palette_has_changed = 1;