Merge commit '0fa00d05911aa8043ecad8dead4a73cab7faadf6'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Mon, 29 Feb 2016 16:56:47 +0000 (16:56 +0000)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Mon, 29 Feb 2016 16:56:47 +0000 (16:56 +0000)
* commit '0fa00d05911aa8043ecad8dead4a73cab7faadf6':
  lavf: move avio_enum_protocols() to protocols.c

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
1  2 
libavformat/avio.c
libavformat/protocols.c

Simple merge
Simple merge