diff options
author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-04-18 15:35:12 +0100 |
---|---|---|
committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-04-18 15:35:12 +0100 |
commit | 4eef36a4f6db1feb9d628337bd96e07a9b482c1a (patch) | |
tree | f0213266326848e00b8a127ff28fd5870f0f4827 /tests/fate/adpcm.mak | |
parent | 94e5f0922b72f0a40ed328b70572ed868571cb96 (diff) | |
parent | d44f3e4059506a182f59218b1e967d42b01e097c (diff) | |
download | ffmpeg-4eef36a4f6db1feb9d628337bd96e07a9b482c1a.tar.gz |
Merge commit 'd44f3e4059506a182f59218b1e967d42b01e097c'
* commit 'd44f3e4059506a182f59218b1e967d42b01e097c':
avio: Apply avoptions on the URLContext itself as well
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'tests/fate/adpcm.mak')
0 files changed, 0 insertions, 0 deletions