Merge commit '7d027b9d6d6290557cc5d4fc56f4b9ed630a7feb'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 30 Apr 2014 19:43:53 +0000 (21:43 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 30 Apr 2014 19:43:56 +0000 (21:43 +0200)
* commit '7d027b9d6d6290557cc5d4fc56f4b9ed630a7feb':
  librtmp: Map native options to librtmp ones when possible

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavformat/librtmp.c

Simple merge