diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2012-06-15 00:09:39 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-06-15 00:14:21 +0200 |
commit | 15f8941108c5372862035ce8e3cbfd2a6cefb241 (patch) | |
tree | 921dc52f4b22ae8f66f251000ecf495154f41e88 /ffmpeg.c | |
parent | 01a14ce0424a45caa24d4a9103afe26c39a6fd35 (diff) | |
parent | d246c18ea6dca4dbdc92aec6ae4e3e038999a709 (diff) | |
download | android_external_ffmpeg-15f8941108c5372862035ce8e3cbfd2a6cefb241.tar.gz android_external_ffmpeg-15f8941108c5372862035ce8e3cbfd2a6cefb241.tar.bz2 android_external_ffmpeg-15f8941108c5372862035ce8e3cbfd2a6cefb241.zip |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
Avoid C99 variable declarations within for statements.
rtmp: Read and handle incoming packets while writing data
doc: document THREAD_TYPE fate variable
rtpdec: Don't require frames to start with a Mode A packet
avconv: don't try to free threads that were not initialized.
Conflicts:
doc/fate.texi
ffplay.c
libavdevice/dv1394.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg.c')
-rw-r--r-- | ffmpeg.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -3372,7 +3372,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); |