From 3a23752c5a065ce34dc56491836e1db1fc3b88ae Mon Sep 17 00:00:00 2001 From: Justin Ruggles <justin.ruggles@gmail.com> Date: Sun, 23 Dec 2012 19:38:34 -0500 Subject: mpc7/8: decode directly to the user-provided AVFrame --- libavcodec/mpc8.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'libavcodec/mpc8.c') diff --git a/libavcodec/mpc8.c b/libavcodec/mpc8.c index a270be36fd..1b32c4b3fa 100644 --- a/libavcodec/mpc8.c +++ b/libavcodec/mpc8.c @@ -230,15 +230,13 @@ static av_cold int mpc8_decode_init(AVCodecContext * avctx) } vlc_initialized = 1; - avcodec_get_frame_defaults(&c->frame); - avctx->coded_frame = &c->frame; - return 0; } static int mpc8_decode_frame(AVCodecContext * avctx, void *data, int *got_frame_ptr, AVPacket *avpkt) { + AVFrame *frame = data; const uint8_t *buf = avpkt->data; int buf_size = avpkt->size; MPCContext *c = avctx->priv_data; @@ -250,8 +248,8 @@ static int mpc8_decode_frame(AVCodecContext * avctx, void *data, int last[2]; /* get output buffer */ - c->frame.nb_samples = MPC_FRAME_SIZE; - if ((res = ff_get_buffer(avctx, &c->frame)) < 0) { + frame->nb_samples = MPC_FRAME_SIZE; + if ((res = ff_get_buffer(avctx, frame)) < 0) { av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); return res; } @@ -407,7 +405,7 @@ static int mpc8_decode_frame(AVCodecContext * avctx, void *data, } ff_mpc_dequantize_and_synth(c, maxband - 1, - (int16_t **)c->frame.extended_data, + (int16_t **)frame->extended_data, avctx->channels); c->cur_frame++; @@ -418,8 +416,7 @@ static int mpc8_decode_frame(AVCodecContext * avctx, void *data, if(c->cur_frame >= c->frames) c->cur_frame = 0; - *got_frame_ptr = 1; - *(AVFrame *)data = c->frame; + *got_frame_ptr = 1; return c->cur_frame ? c->last_bits_used >> 3 : buf_size; } -- cgit v1.2.3