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)
commit8fd5342463b07fdfe2f6e89620182380c1c10ab8
tree08e5fc22df38d0c5dc9c91df2544ecd6cabfa43d
parent9c75148e6ebc88a0501e3d0242defb6dbdc3c23d
parent0fa00d05911aa8043ecad8dead4a73cab7faadf6
Merge commit '0fa00d05911aa8043ecad8dead4a73cab7faadf6'

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

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