Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 11 Jun 2012 19:55:27 +0000 (21:55 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 11 Jun 2012 19:55:32 +0000 (21:55 +0200)
* qatar/master:
  rtmp: Do not send extension for flv files
  rtmp: support connection parameters
  doc: Add documentation for the newly added rtmp_* options

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
doc/protocols.texi
libavformat/rtmpproto.c

Simple merge
Simple merge