#include "internal.h"
typedef struct BethsoftvidContext {
- AVFrame frame;
+ AVFrame *frame;
GetByteContext g;
} BethsoftvidContext;
static av_cold int bethsoftvid_decode_init(AVCodecContext *avctx)
{
BethsoftvidContext *vid = avctx->priv_data;
- avcodec_get_frame_defaults(&vid->frame);
avctx->pix_fmt = AV_PIX_FMT_PAL8;
+
+ vid->frame = av_frame_alloc();
+ if (!vid->frame)
+ return AVERROR(ENOMEM);
+
return 0;
}
static int set_palette(BethsoftvidContext *ctx)
{
- uint32_t *palette = (uint32_t *)ctx->frame.data[1];
+ uint32_t *palette = (uint32_t *)ctx->frame->data[1];
int a;
if (bytestream2_get_bytes_left(&ctx->g) < 256*3)
palette[a] = 0xFFU << 24 | bytestream2_get_be24u(&ctx->g) * 4;
palette[a] |= palette[a] >> 6 & 0x30303;
}
- ctx->frame.palette_has_changed = 1;
+ ctx->frame->palette_has_changed = 1;
return 0;
}
int code, ret;
int yoffset;
- if ((ret = ff_reget_buffer(avctx, &vid->frame)) < 0)
+ if ((ret = ff_reget_buffer(avctx, vid->frame)) < 0)
return ret;
- wrap_to_next_line = vid->frame.linesize[0] - avctx->width;
+ wrap_to_next_line = vid->frame->linesize[0] - avctx->width;
if (avpkt->side_data_elems > 0 &&
avpkt->side_data[0].type == AV_PKT_DATA_PALETTE) {
}
bytestream2_init(&vid->g, avpkt->data, avpkt->size);
- dst = vid->frame.data[0];
- frame_end = vid->frame.data[0] + vid->frame.linesize[0] * avctx->height;
+ dst = vid->frame->data[0];
+ frame_end = vid->frame->data[0] + vid->frame->linesize[0] * avctx->height;
switch(block_type = bytestream2_get_byte(&vid->g)){
case PALETTE_BLOCK: {
yoffset = bytestream2_get_le16(&vid->g);
if(yoffset >= avctx->height)
return AVERROR_INVALIDDATA;
- dst += vid->frame.linesize[0] * yoffset;
+ dst += vid->frame->linesize[0] * yoffset;
}
// main code
}
end:
- if ((ret = av_frame_ref(data, &vid->frame)) < 0)
+ if ((ret = av_frame_ref(data, vid->frame)) < 0)
return ret;
*got_frame = 1;
static av_cold int bethsoftvid_decode_end(AVCodecContext *avctx)
{
BethsoftvidContext * vid = avctx->priv_data;
- av_frame_unref(&vid->frame);
+ av_frame_free(&vid->frame);
return 0;
}