[FFmpeg-cvslog] avcodec_encode_audio2: fix memleak on last padded frame

Michael Niedermayer git at videolan.org
Fri Jun 14 15:28:37 CEST 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Jun 14 15:20:48 2013 +0200| [7fff3df6b277d4f1ebc504e950c9de56cdc14ddd] | committer: Michael Niedermayer

avcodec_encode_audio2: fix memleak on last padded frame

Regression introduced by 799f57ac96f9891d1a0f7d6c4b218ed536e8aca5

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

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

 libavcodec/utils.c |    7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index 8880502..d2fa73f 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -1599,12 +1599,7 @@ int attribute_align_arg avcodec_encode_audio2(AVCodecContext *avctx,
     avpkt->flags |= AV_PKT_FLAG_KEY;
 
 end:
-    if (padded_frame) {
-        av_freep(&padded_frame->data[0]);
-        if (padded_frame->extended_data != padded_frame->data)
-            av_freep(&padded_frame->extended_data);
-        av_freep(&padded_frame);
-    }
+    av_frame_free(&padded_frame);
 
     return ret;
 }



More information about the ffmpeg-cvslog mailing list