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)
commit6c7a05352f5e941a5cfb371d9b8c9a414194dbef
treecf6799eb61ec7cf88eb51057fe5ae6aa9b2dd584
parent06186a3160d031b80c8772a646ab98c27b78d011
parent8e1fe345577a42f99591caf8a06c447613449694
Merge commit '8e1fe345577a42f99591caf8a06c447613449694'

* commit '8e1fe345577a42f99591caf8a06c447613449694':
  rtmp: Detect and warn if the user tries to pass librtmp style parameters

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