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/ftp.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/ftp.c')
-rw-r--r-- | libavformat/ftp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/ftp.c b/libavformat/ftp.c index b9fee2450e..0663b47bc4 100644 --- a/libavformat/ftp.c +++ b/libavformat/ftp.c @@ -543,7 +543,7 @@ static int ftp_connect_control_connection(URLContext *h) } /* if option is not given, don't pass it and let tcp use its own default */ err = ffurl_open_whitelist(&s->conn_control, buf, AVIO_FLAG_READ_WRITE, &h->interrupt_callback, &opts, - h->protocol_whitelist, h->protocol_blacklist); + h->protocol_whitelist, h->protocol_blacklist, h); av_dict_free(&opts); if (err < 0) { av_log(h, AV_LOG_ERROR, "Cannot open control connection\n"); @@ -597,7 +597,7 @@ static int ftp_connect_data_connection(URLContext *h) } /* if option is not given, don't pass it and let tcp use its own default */ err = ffurl_open_whitelist(&s->conn_data, buf, h->flags, &h->interrupt_callback, &opts, - h->protocol_whitelist, h->protocol_blacklist); + h->protocol_whitelist, h->protocol_blacklist, h); av_dict_free(&opts); if (err < 0) return err; |