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/avio.c | |
| parent | be5fde92ff6cf920e2e7d58a864dcf5527404564 (diff) | |
| parent | fab8156b2f30666adabe227b3d7712fd193873b1 (diff) | |
| download | ffmpeg-f8e89d8a297e034d03aac88c73acd1541167ae5e.tar.gz | |
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/avio.c')
| -rw-r--r-- | libavformat/avio.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/libavformat/avio.c b/libavformat/avio.c index 7e68c9a6e9..65075932ae 100644 --- a/libavformat/avio.c +++ b/libavformat/avio.c @@ -305,13 +305,16 @@ int ffurl_alloc(URLContext **puc, const char *filename, int flags, int ffurl_open_whitelist(URLContext **puc, const char *filename, int flags, const AVIOInterruptCB *int_cb, AVDictionary **options, - const char *whitelist, const char* blacklist) + const char *whitelist, const char* blacklist, + URLContext *parent) { AVDictionary *tmp_opts = NULL; AVDictionaryEntry *e; int ret = ffurl_alloc(puc, filename, flags, int_cb); if (ret < 0) return ret; + if (parent) + av_opt_copy(*puc, parent); if (options && (ret = av_opt_set_dict(*puc, options)) < 0) goto fail; @@ -352,7 +355,7 @@ int ffurl_open(URLContext **puc, const char *filename, int flags, const AVIOInterruptCB *int_cb, AVDictionary **options) { return ffurl_open_whitelist(puc, filename, flags, - int_cb, options, NULL, NULL); + int_cb, options, NULL, NULL, NULL); } static inline int retry_transfer_wrapper(URLContext *h, uint8_t *buf, |