Michael Niedermayer 15f8941108 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>
2012-06-15 00:14:21 +02:00
..
2012-06-05 03:02:41 +02:00
2011-12-15 18:38:06 +01:00
2012-02-27 00:00:55 +01:00
2012-01-24 16:03:09 +01:00
2012-01-28 11:04:19 +01:00
2012-05-22 00:39:53 +02:00
2012-06-11 07:28:26 +02:00
2012-05-22 00:39:53 +02:00
2012-05-25 17:27:40 +02:00
2012-03-13 01:14:04 +01:00
2012-03-20 11:10:25 +00:00