aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2012-06-13 13:33:42 +0200
committerAnton Khirnov <anton@khirnov.net>2012-06-14 10:33:10 +0200
commit9034b0ed66c8f4a0da13947618503d575fc43957 (patch)
treeb650a8e1dae296c50c7c81e5215a929a151a313e
parent8517e9c476e8cf92d9ed25b6486bb43d3dc2c49d (diff)
downloadffmpeg-9034b0ed66c8f4a0da13947618503d575fc43957.tar.gz
avconv: don't try to free threads that were not initialized.
-rw-r--r--avconv.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/avconv.c b/avconv.c
index 2ed590d086..9da8d8aeca 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);