aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuca Barbato <lu_zero@gentoo.org>2013-07-01 03:04:15 +0200
committerReinhard Tartler <siretart@tauware.de>2013-07-07 21:11:35 +0200
commite22a5d490de1afefdaaead39b02cb51c79daddc1 (patch)
tree4032ddfd988b0feb5ee1acb730fd7446bd0f1a7e
parentc9d8424395fc9e277f8d70ad55a8f2f74c57a49b (diff)
downloadffmpeg-e22a5d490de1afefdaaead39b02cb51c79daddc1.tar.gz
kmvc: use fixed sized arrays in the context
Avoid some boilerplate code to dynamically allocate and then free the buffers. (cherry picked from commit 8f689770548c86151071ef976cf9b6998ba21c2a) Signed-off-by: Reinhard Tartler <siretart@tauware.de> Conflicts: libavcodec/kmvc.c
-rw-r--r--libavcodec/kmvc.c22
1 files changed, 1 insertions, 21 deletions
diff --git a/libavcodec/kmvc.c b/libavcodec/kmvc.c
index a6bb13b95a..fca0c728e8 100644
--- a/libavcodec/kmvc.c
+++ b/libavcodec/kmvc.c
@@ -46,7 +46,7 @@ typedef struct KmvcContext {
int palsize;
uint32_t pal[MAX_PALSIZE];
uint8_t *cur, *prev;
- uint8_t *frm0, *frm1;
+ uint8_t frm0[320 * 200], frm1[320 * 200];
GetByteContext g;
} KmvcContext;
@@ -367,8 +367,6 @@ static av_cold int decode_init(AVCodecContext * avctx)
return -1;
}
- c->frm0 = av_mallocz(320 * 200);
- c->frm1 = av_mallocz(320 * 200);
c->cur = c->frm0;
c->prev = c->frm1;
@@ -401,30 +399,12 @@ static av_cold int decode_init(AVCodecContext * avctx)
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);
- if (c->pic.data[0])
- avctx->release_buffer(avctx, &c->pic);
-
- return 0;
-}
-
AVCodec ff_kmvc_decoder = {
.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"),