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>

diff --cc doc/protocols.texi
Simple merge

diff --cc libavformat/rtmpproto.c
Simple merge