[FFmpeg-cvslog] Merge commit '0fa00d05911aa8043ecad8dead4a73cab7faadf6'

[Derek Buitenhuis]

ffmpeg | branch: master | Derek Buitenhuis <derek.buitenhuis at gmail.com> | Mon Feb 29 16:56:47 2016 +0000| [8fd5342463b07fdfe2f6e89620182380c1c10ab8] | committer: Derek Buitenhuis

Merge commit '0fa00d05911aa8043ecad8dead4a73cab7faadf6'

* commit '0fa00d05911aa8043ecad8dead4a73cab7faadf6':
  lavf: move avio_enum_protocols() to protocols.c

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

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