diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-04-21 15:55:09 +0100 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-04-21 15:55:09 +0100 |
| commit | f8e89d8a297e034d03aac88c73acd1541167ae5e (patch) | |
| tree | 036de2728a2748e27d01f273ba431f411eb7b018 /libavformat/aviobuf.c | |
| 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 'libavformat/aviobuf.c')
| -rw-r--r-- | libavformat/aviobuf.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/aviobuf.c b/libavformat/aviobuf.c index f2f03f639f..f02ae21dfd 100644 --- a/libavformat/aviobuf.c +++ b/libavformat/aviobuf.c @@ -989,7 +989,7 @@ int ffio_open_whitelist(AVIOContext **s, const char *filename, int flags, URLContext *h; int err; - err = ffurl_open_whitelist(&h, filename, flags, int_cb, options, whitelist, blacklist); + err = ffurl_open_whitelist(&h, filename, flags, int_cb, options, whitelist, blacklist, NULL); if (err < 0) return err; err = ffio_fdopen(s, h); |