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/http.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/http.c')
| -rw-r--r-- | libavformat/http.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavformat/http.c b/libavformat/http.c index 814ca014ce..622814bb05 100644 --- a/libavformat/http.c +++ b/libavformat/http.c @@ -221,7 +221,7 @@ static int http_open_cnx_internal(URLContext *h, AVDictionary **options) if (!s->hd) { err = ffurl_open_whitelist(&s->hd, buf, AVIO_FLAG_READ_WRITE, &h->interrupt_callback, options, - h->protocol_whitelist, h->protocol_blacklist); + h->protocol_whitelist, h->protocol_blacklist, h); if (err < 0) return err; } @@ -456,7 +456,7 @@ static int http_listen(URLContext *h, const char *uri, int flags, goto fail; if ((ret = ffurl_open_whitelist(&s->hd, lower_url, AVIO_FLAG_READ_WRITE, &h->interrupt_callback, options, - h->protocol_whitelist, h->protocol_blacklist + h->protocol_whitelist, h->protocol_blacklist, h )) < 0) goto fail; s->handshake_step = LOWER_PROTO; @@ -1582,7 +1582,7 @@ static int http_proxy_open(URLContext *h, const char *uri, int flags) redo: ret = ffurl_open_whitelist(&s->hd, lower_url, AVIO_FLAG_READ_WRITE, &h->interrupt_callback, NULL, - h->protocol_whitelist, h->protocol_blacklist); + h->protocol_whitelist, h->protocol_blacklist, h); if (ret < 0) return ret; |