[FFmpeg-cvslog] Merge commit '8e1fe345577a42f99591caf8a06c447613449694'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Aug 11 11:17:38 2013 +0200| [6c7a05352f5e941a5cfb371d9b8c9a414194dbef] | committer: Michael Niedermayer

Merge commit '8e1fe345577a42f99591caf8a06c447613449694'

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

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

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