[FFmpeg-cvslog] LATM/AAC: Free previously initialized context on reinit.

Ronald S. Bultje git at videolan.org
Sat May 21 05:36:10 CEST 2011


ffmpeg | branch: master | Ronald S. Bultje <rsbultje at gmail.com> | Fri May 20 10:49:20 2011 -0400| [42da8ea8e848e65611f0c606cd2c96d3a70c041d] | committer: Diego Biurrun

LATM/AAC: Free previously initialized context on reinit.

Fixes memory leaks which are the result of overwriting already-initialized
MDCT contexts during context reinitialization, e.g. in valgrind
fate-aac-latm_000000001180bc60.

Signed-off-by: Diego Biurrun <diego at biurrun.de>

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

 libavcodec/aacdec.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/libavcodec/aacdec.c b/libavcodec/aacdec.c
index f2d50f4..fbb3582 100644
--- a/libavcodec/aacdec.c
+++ b/libavcodec/aacdec.c
@@ -2464,6 +2464,7 @@ static int latm_decode_frame(AVCodecContext *avctx, void *out, int *out_size,
             *out_size = 0;
             return avpkt->size;
         } else {
+            aac_decode_close(avctx);
             if ((err = aac_decode_init(avctx)) < 0)
                 return err;
             latmctx->initialized = 1;



More information about the ffmpeg-cvslog mailing list