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)
commit94d5650266f3bd5a43088f4419a1d60f89d6249c
tree5c37c2ef86355dbb423fb7c3ba80bc13a5fe9064
parent65efc66d8ea9aee562d26e2522ad94229649897a
parentf862537de8ba7920e0f25318c03f8982a3c6294c
Merge remote-tracking branch 'qatar/master'

* 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>
doc/protocols.texi
libavformat/rtmpproto.c