Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 14 Jun 2012 22:09:39 +0000 (00:09 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 14 Jun 2012 22:14:21 +0000 (00:14 +0200)
commit15f8941108c5372862035ce8e3cbfd2a6cefb241
tree921dc52f4b22ae8f66f251000ecf495154f41e88
parent01a14ce0424a45caa24d4a9103afe26c39a6fd35
parentd246c18ea6dca4dbdc92aec6ae4e3e038999a709
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>
doc/fate.texi
ffmpeg.c
ffplay.c
libavcodec/pthread.c
libavdevice/dv1394.h
libavformat/rtmppkt.c
libavformat/rtmppkt.h
libavformat/rtmpproto.c