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 /libavcodec/pthread.c | |
| parent | 01a14ce0424a45caa24d4a9103afe26c39a6fd35 (diff) | |
| parent | d246c18ea6dca4dbdc92aec6ae4e3e038999a709 (diff) | |
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 'libavcodec/pthread.c')
| -rw-r--r-- | libavcodec/pthread.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/pthread.c b/libavcodec/pthread.c index 482c8456af..4d84d4ce9d 100644 --- a/libavcodec/pthread.c +++ b/libavcodec/pthread.c @@ -886,8 +886,8 @@ error: void ff_thread_flush(AVCodecContext *avctx) { - FrameThreadContext *fctx = avctx->thread_opaque; int i; + FrameThreadContext *fctx = avctx->thread_opaque; if (!avctx->thread_opaque) return; |