return AVERROR(ENOMEM);
cc->transparency = -1;
- avctx->width = CDG_FULL_WIDTH;
- avctx->height = CDG_FULL_HEIGHT;
avctx->pix_fmt = AV_PIX_FMT_PAL8;
-
- return 0;
+ return ff_set_dimensions(avctx, CDG_FULL_WIDTH, CDG_FULL_HEIGHT);
}
static void cdg_border_preset(CDGraphicsContext *cc, uint8_t *data)
bytestream2_init(&gb, avpkt->data, avpkt->size);
- if ((ret = ff_reget_buffer(avctx, cc->frame)) < 0)
+ if ((ret = ff_reget_buffer(avctx, cc->frame, 0)) < 0)
return ret;
if (!cc->cleared) {
memset(cc->frame->data[0], 0, cc->frame->linesize[0] * avctx->height);
return avpkt->size;
}
+static void cdg_decode_flush(AVCodecContext *avctx)
+{
+ CDGraphicsContext *cc = avctx->priv_data;
+
+ if (!cc->frame->data[0])
+ return;
+
+ memset(cc->frame->data[0], 0, cc->frame->linesize[0] * avctx->height);
+ if (!avctx->frame_number)
+ memset(cc->frame->data[1], 0, AVPALETTE_SIZE);
+}
+
static av_cold int cdg_decode_end(AVCodecContext *avctx)
{
CDGraphicsContext *cc = avctx->priv_data;
return 0;
}
-AVCodec ff_cdgraphics_decoder = {
+const AVCodec ff_cdgraphics_decoder = {
.name = "cdgraphics",
.long_name = NULL_IF_CONFIG_SMALL("CD Graphics video"),
.type = AVMEDIA_TYPE_VIDEO,
.init = cdg_decode_init,
.close = cdg_decode_end,
.decode = cdg_decode_frame,
+ .flush = cdg_decode_flush,
.capabilities = AV_CODEC_CAP_DR1,
};