commit 3a23752c5a065ce34dc56491836e1db1fc3b88ae
author Justin Ruggles <justin.ruggles@gmail.com> Mon Dec 24 00:38:34 2012
committer Justin Ruggles <justin.ruggles@gmail.com> Tue Feb 12 17:21:23 2013
tree 7a4fe60bbb2cb7e98716938af67cf2c65114393c
parent 2c785e250a1f4a6ee2b35e1c86dda79553d2a6c1

mpc7/8: decode directly to the user-provided AVFrame

libavcodec/mpc7.c

diff --git a/libavcodec/mpc7.c b/libavcodec/mpc7.c
index 6a2b120..f151f9c3 100644
--- a/libavcodec/mpc7.c
+++ b/libavcodec/mpc7.c
@@ -139,9 +139,6 @@
     }
     vlc_initialized = 1;
 
-    avcodec_get_frame_defaults(&c->frame);
-    avctx->coded_frame = &c->frame;
-
     return 0;
 }
 
@@ -201,6 +198,7 @@
 static int mpc7_decode_frame(AVCodecContext * avctx, void *data,
                              int *got_frame_ptr, AVPacket *avpkt)
 {
+    AVFrame *frame     = data;
     const uint8_t *buf = avpkt->data;
     int buf_size;
     MPCContext *c = avctx->priv_data;
@@ -230,8 +228,8 @@
     buf_size  -= 4;
 
     /* get output buffer */
-    c->frame.nb_samples = last_frame ? c->lastframelen : MPC_FRAME_SIZE;
-    if ((ret = ff_get_buffer(avctx, &c->frame)) < 0) {
+    frame->nb_samples = last_frame ? c->lastframelen : MPC_FRAME_SIZE;
+    if ((ret = ff_get_buffer(avctx, frame)) < 0) {
         av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
         return ret;
     }
@@ -295,7 +293,7 @@
         for(ch = 0; ch < 2; ch++)
             idx_to_quant(c, &gb, bands[i].res[ch], c->Q[ch] + off);
 
-    ff_mpc_dequantize_and_synth(c, mb, (int16_t **)c->frame.extended_data, 2);
+    ff_mpc_dequantize_and_synth(c, mb, (int16_t **)frame->extended_data, 2);
 
     bits_used = get_bits_count(&gb);
     bits_avail = buf_size * 8;
@@ -309,8 +307,7 @@
         return avpkt->size;
     }
 
-    *got_frame_ptr   = 1;
-    *(AVFrame *)data = c->frame;
+    *got_frame_ptr = 1;
 
     return avpkt->size;
 }