Commit 1aeddc3c authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '8f689770'

* commit '8f689770':
  kmvc: use fixed sized arrays in the context
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents dc2a13aa 8f689770
...@@ -46,7 +46,7 @@ typedef struct KmvcContext { ...@@ -46,7 +46,7 @@ typedef struct KmvcContext {
int palsize; int palsize;
uint32_t pal[MAX_PALSIZE]; uint32_t pal[MAX_PALSIZE];
uint8_t *cur, *prev; uint8_t *cur, *prev;
uint8_t *frm0, *frm1; uint8_t frm0[320 * 200], frm1[320 * 200];
GetByteContext g; GetByteContext g;
} KmvcContext; } KmvcContext;
...@@ -378,8 +378,6 @@ static av_cold int decode_init(AVCodecContext * avctx) ...@@ -378,8 +378,6 @@ static av_cold int decode_init(AVCodecContext * avctx)
return AVERROR(EINVAL); return AVERROR(EINVAL);
} }
c->frm0 = av_mallocz(320 * 200);
c->frm1 = av_mallocz(320 * 200);
c->cur = c->frm0; c->cur = c->frm0;
c->prev = c->frm1; c->prev = c->frm1;
...@@ -414,28 +412,12 @@ static av_cold int decode_init(AVCodecContext * avctx) ...@@ -414,28 +412,12 @@ static av_cold int decode_init(AVCodecContext * avctx)
return 0; return 0;
} }
/*
* Uninit kmvc decoder
*/
static av_cold int decode_end(AVCodecContext * avctx)
{
KmvcContext *const c = avctx->priv_data;
av_freep(&c->frm0);
av_freep(&c->frm1);
return 0;
}
AVCodec ff_kmvc_decoder = { AVCodec ff_kmvc_decoder = {
.name = "kmvc", .name = "kmvc",
.type = AVMEDIA_TYPE_VIDEO, .type = AVMEDIA_TYPE_VIDEO,
.id = AV_CODEC_ID_KMVC, .id = AV_CODEC_ID_KMVC,
.priv_data_size = sizeof(KmvcContext), .priv_data_size = sizeof(KmvcContext),
.init = decode_init, .init = decode_init,
.close = decode_end,
.decode = decode_frame, .decode = decode_frame,
.capabilities = CODEC_CAP_DR1, .capabilities = CODEC_CAP_DR1,
.long_name = NULL_IF_CONFIG_SMALL("Karl Morton's video codec"), .long_name = NULL_IF_CONFIG_SMALL("Karl Morton's video codec"),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment