[FFmpeg-cvslog] Merge commit '7d027b9d6d6290557cc5d4fc56f4b9ed630a7feb'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Apr 30 21:43:53 2014 +0200| [a1ac27bc6639792c5ace89add806fd6966e1a84f] | committer: Michael Niedermayer

Merge commit '7d027b9d6d6290557cc5d4fc56f4b9ed630a7feb'

* commit '7d027b9d6d6290557cc5d4fc56f4b9ed630a7feb':
  librtmp: Map native options to librtmp ones when possible

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a1ac27bc6639792c5ace89add806fd6966e1a84f
---