OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
8517e9c
)
avconv: don't try to free threads that were not initialized.
author
Anton Khirnov
<anton@khirnov.net>
Wed, 13 Jun 2012 11:33:42 +0000
(13:33 +0200)
committer
Anton Khirnov
<anton@khirnov.net>
Thu, 14 Jun 2012 08:33:10 +0000
(10:33 +0200)
avconv.c
patch
|
blob
|
history
diff --git
a/avconv.c
b/avconv.c
index
2ed590d
..
9da8d8a
100644
(file)
--- 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);