[FFmpeg-cvslog] Merge commit '832a202c47a246ed15e3edc6b05dfcfa7d82c4b2'

[Derek Buitenhuis]

ffmpeg | branch: master | Derek Buitenhuis <derek.buitenhuis at gmail.com> | Mon Feb 29 18:07:41 2016 +0000| [bb8cc89b2986df6f60831b67cd250da312cce1d0] | committer: Derek Buitenhuis

Merge commit '832a202c47a246ed15e3edc6b05dfcfa7d82c4b2'

* commit '832a202c47a246ed15e3edc6b05dfcfa7d82c4b2':
  protocols: make the list of protocols static

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

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