diff options
author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-03-04 16:14:53 +0000 |
---|---|---|
committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-03-04 16:14:53 +0000 |
commit | 063b26d35857f72b4f9bd24ea509808291f5d6b8 (patch) | |
tree | 5542b9328b19547421d8532ff6d3345feb2d2c4f /libavutil/aes.h | |
parent | 93629735d76c09405248c1f6b2b2c5517fff88fd (diff) | |
parent | ec4c48397641dbaf4ae8df36c32aaa5a311a11bf (diff) | |
download | ffmpeg-063b26d35857f72b4f9bd24ea509808291f5d6b8.tar.gz |
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>
Diffstat (limited to 'libavutil/aes.h')
0 files changed, 0 insertions, 0 deletions