[FFmpeg-cvslog] ffmpeg: free threads on error conditions.

Michael Niedermayer git at videolan.org
Fri May 17 23:28:01 CEST 2013


ffmpeg | branch: release/1.2 | Michael Niedermayer <michaelni at gmx.at> | Wed May 15 01:08:18 2013 +0200| [ffd28de388638036c1a88f793876423507c21c48] | committer: Carl Eugen Hoyos

ffmpeg: free threads on error conditions.

Fixes Ticket2562

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 1a36c756d8959207d3386f03e11c15216abc50b7)

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

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

diff --git a/ffmpeg.c b/ffmpeg.c
index 2ea3694..b272b55 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]);



More information about the ffmpeg-cvslog mailing list