[FFmpeg-cvslog] Fix memleak after switch to encode_audio2 API.

Reimar Döffinger git at videolan.org
Tue Jan 17 22:16:42 CET 2012


ffmpeg | branch: master | Reimar Döffinger <Reimar.Doeffinger at gmx.de> | Tue Jan 17 20:55:54 2012 +0100| [d393f41a33abc093a6a5ca1999e6c2515a86498a] | committer: Reimar Döffinger

Fix memleak after switch to encode_audio2 API.

Obviously the packet allocated by the encoder must be freed somewhere.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger at gmx.de>

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

 ffmpeg.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/ffmpeg.c b/ffmpeg.c
index b9297df..ba8dfc9 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -1065,6 +1065,8 @@ static int encode_audio_frame(AVFormatContext *s, OutputStream *ost,
         exit_program(1);
     }
 
+    ret = pkt.size;
+
     if (got_packet) {
         pkt.stream_index = ost->index;
         if (pkt.pts != AV_NOPTS_VALUE)
@@ -1075,12 +1077,14 @@ static int encode_audio_frame(AVFormatContext *s, OutputStream *ost,
         write_frame(s, &pkt, ost);
 
         audio_size += pkt.size;
+
+        av_free_packet(&pkt);
     }
 
     if (frame)
         ost->sync_opts += frame->nb_samples;
 
-    return pkt.size;
+    return ret;
 }
 
 static void do_audio_out(AVFormatContext *s, OutputStream *ost,



More information about the ffmpeg-cvslog mailing list