[FFmpeg-cvslog] ffmpeg: fix a memleak in subtitles decoding.

Clément Bœsch git at videolan.org
Fri Jun 29 20:29:52 CEST 2012


ffmpeg | branch: master | Clément Bœsch <ubitux at gmail.com> | Fri Jun 22 22:15:24 2012 +0200| [f926d9161136294936b65d64a9021ce35df3c8c2] | committer: Clément Bœsch

ffmpeg: fix a memleak in subtitles decoding.

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

 ffmpeg.c |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ffmpeg.c b/ffmpeg.c
index f442638..e3ed179 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -176,6 +176,8 @@ static int print_stats = 1;
 static int debug_ts = 0;
 static int current_time;
 
+static uint8_t *subtitle_out;
+
 #if HAVE_PTHREADS
 /* signal to input threads that they should exit; set by the main thread */
 static int transcoding_finished;
@@ -1374,6 +1376,8 @@ void av_noreturn exit_program(int ret)
     }
     av_freep(&filtergraphs);
 
+    av_freep(&subtitle_out);
+
     /* close files */
     for (i = 0; i < nb_output_files; i++) {
         AVFormatContext *s = output_files[i]->ctx;
@@ -1649,7 +1653,6 @@ static void do_subtitle_out(AVFormatContext *s,
                             AVSubtitle *sub,
                             int64_t pts)
 {
-    static uint8_t *subtitle_out = NULL;
     int subtitle_out_max_size = 1024 * 1024;
     int subtitle_out_size, nb, i;
     AVCodecContext *enc;



More information about the ffmpeg-cvslog mailing list