Merge commit 'ec4c48397641dbaf4ae8df36c32aaa5a311a11bf'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Fri, 4 Mar 2016 16:14:53 +0000 (16:14 +0000)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Fri, 4 Mar 2016 16:14:53 +0000 (16:14 +0000)
commit063b26d35857f72b4f9bd24ea509808291f5d6b8
tree5542b9328b19547421d8532ff6d3345feb2d2c4f
parent93629735d76c09405248c1f6b2b2c5517fff88fd
parentec4c48397641dbaf4ae8df36c32aaa5a311a11bf
Merge commit 'ec4c48397641dbaf4ae8df36c32aaa5a311a11bf'

This is a no-op. API is already implemented by us.

* commit 'ec4c48397641dbaf4ae8df36c32aaa5a311a11bf':
  lavf: add a protocol whitelist/blacklist for file opened internally

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