diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-03-03 16:12:16 +0000 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-03-03 16:12:35 +0000 |
| commit | 510046c228cb1232313195c6a9b6a5345dddba0b (patch) | |
| tree | d25b8d355e9daf2bbaf7a179eaa01197bac9dd69 | |
| parent | ba687ae0bdd168332261853a965576bc78c4f7e0 (diff) | |
| parent | 8c0ceafb0f25da077ff23e394667119f031574fd (diff) | |
| download | ffmpeg-510046c228cb1232313195c6a9b6a5345dddba0b.tar.gz | |
Merge commit '8c0ceafb0f25da077ff23e394667119f031574fd'
This commit is a no-p. We already have a mechanism to do this.
* commit '8c0ceafb0f25da077ff23e394667119f031574fd':
urlprotocol: receive a list of protocols from the caller
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
0 files changed, 0 insertions, 0 deletions