[FFmpeg-cvslog] Merge commit '7ce3bd9614717e545af8fb8455032c807e389b78'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed May  7 00:39:26 2014 +0200| [d68ed9f257bd9e76c6d615e03ba135a3df673712] | committer: Michael Niedermayer

Merge commit '7ce3bd9614717e545af8fb8455032c807e389b78'

* commit '7ce3bd9614717e545af8fb8455032c807e389b78':
  rtmpproto: Support alternative slist parameter in rtmp URLs

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

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