Merge commit '832a202c47a246ed15e3edc6b05dfcfa7d82c4b2'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Mon, 29 Feb 2016 18:07:41 +0000 (18:07 +0000)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Mon, 29 Feb 2016 18:08:15 +0000 (18:08 +0000)
commitbb8cc89b2986df6f60831b67cd250da312cce1d0
tree6678d45fc1451bc18bbc92de58bcf1f5308ac4c7
parent95cdc0a5c658a3f4301a66bcb1d96d11dc941151
parent832a202c47a246ed15e3edc6b05dfcfa7d82c4b2
Merge commit '832a202c47a246ed15e3edc6b05dfcfa7d82c4b2'

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

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