[FFmpeg-cvslog] avconv: don't try to free threads that were not initialized.
Anton Khirnov
git at videolan.org
Fri Jun 15 00:19:10 CEST 2012
ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Wed Jun 13 13:33:42 2012 +0200| [9034b0ed66c8f4a0da13947618503d575fc43957] | committer: Anton Khirnov
avconv: don't try to free threads that were not initialized.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9034b0ed66c8f4a0da13947618503d575fc43957
---
avconv.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/avconv.c b/avconv.c
index 2ed590d..9da8d8a 100644
--- a/avconv.c
+++ b/avconv.c
@@ -2827,7 +2827,7 @@ static void free_input_threads(void)
InputFile *f = input_files[i];
AVPacket pkt;
- if (f->joined)
+ if (!f->fifo || f->joined)
continue;
pthread_mutex_lock(&f->fifo_lock);
More information about the ffmpeg-cvslog
mailing list