Merge commit '8e1fe345577a42f99591caf8a06c447613449694'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 11 Aug 2013 09:17:38 +0000 (11:17 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 11 Aug 2013 09:17:43 +0000 (11:17 +0200)
* commit '8e1fe345577a42f99591caf8a06c447613449694':
  rtmp: Detect and warn if the user tries to pass librtmp style parameters

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

Simple merge