[FFmpeg-cvslog] avcodec/mpc8: get frame output buffer right before it is actually needed

Paul B Mahol git at videolan.org
Fri Mar 30 14:01:43 EEST 2018


ffmpeg | branch: master | Paul B Mahol <onemda at gmail.com> | Fri Mar 30 12:34:05 2018 +0200| [e30a37e95e43148f7a7d907736aaaad5bbead95e] | committer: Paul B Mahol

avcodec/mpc8: get frame output buffer right before it is actually needed

Signed-off-by: Paul B Mahol <onemda at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e30a37e95e43148f7a7d907736aaaad5bbead95e
---

 libavcodec/mpc8.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/libavcodec/mpc8.c b/libavcodec/mpc8.c
index 6347e1f691..3be2f79a5a 100644
--- a/libavcodec/mpc8.c
+++ b/libavcodec/mpc8.c
@@ -250,11 +250,6 @@ static int mpc8_decode_frame(AVCodecContext * avctx, void *data,
     int maxband, keyframe;
     int last[2];
 
-    /* get output buffer */
-    frame->nb_samples = MPC_FRAME_SIZE;
-    if ((res = ff_get_buffer(avctx, frame, 0)) < 0)
-        return res;
-
     keyframe = c->cur_frame == 0;
 
     if(keyframe){
@@ -415,6 +410,10 @@ static int mpc8_decode_frame(AVCodecContext * avctx, void *data,
         }
     }
 
+    frame->nb_samples = MPC_FRAME_SIZE;
+    if ((res = ff_get_buffer(avctx, frame, 0)) < 0)
+        return res;
+
     ff_mpc_dequantize_and_synth(c, maxband - 1,
                                 (int16_t **)frame->extended_data,
                                 avctx->channels);



More information about the ffmpeg-cvslog mailing list