[FFmpeg-cvslog] avcodec/mpegaudiodec_template: only allocate fdsp when its used

Michael Niedermayer git at videolan.org
Mon Dec 15 15:25:04 CET 2014


ffmpeg | branch: release/2.5 | Michael Niedermayer <michaelni at gmx.at> | Fri Dec  5 04:27:49 2014 +0100| [aa24dd487f1a4d5d4ed8b63a58ab4490afa8dc76] | committer: Michael Niedermayer

avcodec/mpegaudiodec_template: only allocate fdsp when its used

Fixes memleak

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit a7ebd0b011f9576c843a86bd6a1828ecaa6faf3a)

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

 libavcodec/mpegaudiodec_template.c |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/libavcodec/mpegaudiodec_template.c b/libavcodec/mpegaudiodec_template.c
index bbd07c5..138a107 100644
--- a/libavcodec/mpegaudiodec_template.c
+++ b/libavcodec/mpegaudiodec_template.c
@@ -428,9 +428,11 @@ static av_cold int decode_init(AVCodecContext * avctx)
 
     s->avctx = avctx;
 
+#if USE_FLOATS
     s->fdsp = avpriv_float_dsp_alloc(avctx->flags & CODEC_FLAG_BITEXACT);
     if (!s->fdsp)
         return AVERROR(ENOMEM);
+#endif
 
     ff_mpadsp_init(&s->mpadsp);
 



More information about the ffmpeg-cvslog mailing list