From: Clément Bœsch <ubitux@gmail.com>
Date: Fri, 22 Jun 2012 20:15:24 +0000 (+0200)
Subject: ffmpeg: fix a memleak in subtitles decoding.
X-Git-Tag: android-x86-4.4-r1~10957
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=f926d9161136294936b65d64a9021ce35df3c8c2;p=android-x86%2Fexternal-ffmpeg.git

ffmpeg: fix a memleak in subtitles decoding.
---

diff --git a/ffmpeg.c b/ffmpeg.c
index f442638736..e3ed179b80 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;