[FFmpeg-cvslog] Merge commit 'ec4c48397641dbaf4ae8df36c32aaa5a311a11bf'

[Derek Buitenhuis]

ffmpeg | branch: master | Derek Buitenhuis <derek.buitenhuis at gmail.com> | Fri Mar  4 16:14:53 2016 +0000| [063b26d35857f72b4f9bd24ea509808291f5d6b8] | committer: Derek Buitenhuis

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 at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=063b26d35857f72b4f9bd24ea509808291f5d6b8
---