summaryrefslogtreecommitdiff
path: root/ffmpeg.c
diff options
context:
space:
mode:
authorClément Bœsch <ubitux@gmail.com>2012-06-22 22:15:24 +0200
committerClément Bœsch <ubitux@gmail.com>2012-06-29 19:13:24 +0200
commitf926d9161136294936b65d64a9021ce35df3c8c2 (patch)
tree6628c66df07c53c4c95008d399ce27d117641e40 /ffmpeg.c
parentc1abfbc47c9395692c0570bea9c778785941cfdd (diff)
downloadffmpeg-f926d9161136294936b65d64a9021ce35df3c8c2.tar.gz
ffmpeg: fix a memleak in subtitles decoding.
Diffstat (limited to 'ffmpeg.c')
-rw-r--r--ffmpeg.c5
1 files changed, 4 insertions, 1 deletions
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;