From: Michael Niedermayer <michaelni@gmx.at>
Date: Mon, 11 Jun 2012 19:55:27 +0000 (+0200)
Subject: Merge remote-tracking branch 'qatar/master'
X-Git-Tag: android-x86-4.4-r1~11288
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=94d5650266f3bd5a43088f4419a1d60f89d6249c;p=android-x86%2Fexternal-ffmpeg.git

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>
---

94d5650266f3bd5a43088f4419a1d60f89d6249c