aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-05-15 01:08:18 +0200
committerCarl Eugen Hoyos <cehoyos@ag.or.at>2013-05-17 23:21:43 +0200
commitffd28de388638036c1a88f793876423507c21c48 (patch)
tree3e7f2b13a410e52377e7c498acff20e244fce99b
parentaf589dd5e9f804629ac025ba6b40f750426a6e41 (diff)
downloadffmpeg-ffd28de388638036c1a88f793876423507c21c48.tar.gz
ffmpeg: free threads on error conditions.
Fixes Ticket2562 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 1a36c756d8959207d3386f03e11c15216abc50b7)
-rw-r--r--ffmpeg.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/ffmpeg.c b/ffmpeg.c
index 2ea3694394..b272b55f8f 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -162,6 +162,8 @@ static struct termios oldtty;
static int restore_tty;
#endif
+static void free_input_threads(void);
+
/* sub2video hack:
Convert subtitles to video with alpha to insert them in filter graphs.
@@ -457,6 +459,9 @@ static void exit_program(void)
av_freep(&output_streams[i]->logfile_prefix);
av_freep(&output_streams[i]);
}
+#if HAVE_PTHREADS
+ free_input_threads();
+#endif
for (i = 0; i < nb_input_files; i++) {
avformat_close_input(&input_files[i]->ctx);
av_freep(&input_files[i]);