[FFmpeg-cvslog] Merge commit '8c0ceafb0f25da077ff23e394667119f031574fd'

[Derek Buitenhuis]

ffmpeg | branch: master | Derek Buitenhuis <derek.buitenhuis at gmail.com> | Thu Mar  3 16:12:16 2016 +0000| [510046c228cb1232313195c6a9b6a5345dddba0b] | committer: Derek Buitenhuis

Merge commit '8c0ceafb0f25da077ff23e394667119f031574fd'

This commit is a no-p. We already have a mechanism to do this.

* commit '8c0ceafb0f25da077ff23e394667119f031574fd':
  urlprotocol: receive a list of protocols from the caller

Merged-by: Derek Buitenhuis <derek.buitenhuis at gmail.com>

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