Merge commit '0fa00d05911aa8043ecad8dead4a73cab7faadf6'

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

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

diff --cc libavformat/avio.c
Simple merge

diff --cc libavformat/protocols.c
Simple merge