• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 15f89411
    Michael Niedermayer authored
    * 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: 's avatarMichael Niedermayer <michaelni@gmx.at>
    15f89411
fate.texi 6.16 KB