int i;
int header;
int blocksize;
+ const uint8_t *pal = av_packet_get_side_data(avpkt, AV_PKT_DATA_PALETTE, NULL);
if (ctx->pic.data[0])
avctx->release_buffer(avctx, &ctx->pic);
if (header & KMVC_KEYFRAME) {
ctx->pic.key_frame = 1;
- ctx->pic.pict_type = FF_I_TYPE;
+ ctx->pic.pict_type = AV_PICTURE_TYPE_I;
} else {
ctx->pic.key_frame = 0;
- ctx->pic.pict_type = FF_P_TYPE;
- }
-
- /* if palette has been changed, copy it from palctrl */
- if (ctx->avctx->palctrl && ctx->avctx->palctrl->palette_changed) {
- memcpy(ctx->pal, ctx->avctx->palctrl->palette, AVPALETTE_SIZE);
- ctx->setpal = 1;
- ctx->avctx->palctrl->palette_changed = 0;
+ ctx->pic.pict_type = AV_PICTURE_TYPE_P;
}
if (header & KMVC_PALETTE) {
}
}
+ if (pal) {
+ ctx->pic.palette_has_changed = 1;
+ memcpy(ctx->pal, pal, AVPALETTE_SIZE);
+ }
+
if (ctx->setpal) {
ctx->setpal = 0;
ctx->pic.palette_has_changed = 1;
src += 4;
}
c->setpal = 1;
- if (c->avctx->palctrl) {
- c->avctx->palctrl->palette_changed = 0;
- }
}
avctx->pix_fmt = PIX_FMT_PAL8;
}
AVCodec ff_kmvc_decoder = {
- "kmvc",
- AVMEDIA_TYPE_VIDEO,
- CODEC_ID_KMVC,
- sizeof(KmvcContext),
- decode_init,
- NULL,
- decode_end,
- decode_frame,
- CODEC_CAP_DR1,
+ .name = "kmvc",
+ .type = AVMEDIA_TYPE_VIDEO,
+ .id = CODEC_ID_KMVC,
+ .priv_data_size = sizeof(KmvcContext),
+ .init = decode_init,
+ .close = decode_end,
+ .decode = decode_frame,
+ .capabilities = CODEC_CAP_DR1,
.long_name = NULL_IF_CONFIG_SMALL("Karl Morton's video codec"),
};