diff options
author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-04-21 17:55:09 +0300 |
---|---|---|
committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-04-21 17:55:09 +0300 |
commit | f8e89d8a297e034d03aac88c73acd1541167ae5e (patch) | |
tree | 036de2728a2748e27d01f273ba431f411eb7b018 /libavresample/aarch64 | |
parent | be5fde92ff6cf920e2e7d58a864dcf5527404564 (diff) | |
parent | fab8156b2f30666adabe227b3d7712fd193873b1 (diff) |
Merge commit 'fab8156b2f30666adabe227b3d7712fd193873b1'
* commit 'fab8156b2f30666adabe227b3d7712fd193873b1':
avio: Copy URLContext generic options into child URLContexts
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavresample/aarch64')
0 files changed, 0 insertions, 0 deletions