diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-01 01:32:33 +0300 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-01 01:32:33 +0300 |
| commit | ca6fee7606866a0cb7676b95db4c462500cc8d2d (patch) | |
| tree | b0dd183baf4286b7aea00d2038877e46233107a4 /libavformat/tls.c | |
| parent | c5c4e5839ad1459bdbd69ffa7d33949577662a6c (diff) | |
| parent | b9d2d6843a49f9df1d1ae1afe817d9b48c445919 (diff) | |
Merge commit 'b9d2d6843a49f9df1d1ae1afe817d9b48c445919'
* commit 'b9d2d6843a49f9df1d1ae1afe817d9b48c445919':
tls: Pass AVOptions dictionaries through to the chained protocol
Conflicts:
libavformat/tls.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/tls.c')
| -rw-r--r-- | libavformat/tls.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavformat/tls.c b/libavformat/tls.c index 65b263aef6..2a415c9287 100644 --- a/libavformat/tls.c +++ b/libavformat/tls.c @@ -163,7 +163,7 @@ static void set_options(URLContext *h, const char *uri) c->key_file = av_strdup(buf); } -static int tls_open(URLContext *h, const char *uri, int flags) +static int tls_open(URLContext *h, const char *uri, int flags, AVDictionary **options) { TLSContext *c = h->priv_data; int ret; @@ -216,7 +216,7 @@ static int tls_open(URLContext *h, const char *uri, int flags) } ret = ffurl_open(&c->tcp, buf, AVIO_FLAG_READ_WRITE, - &h->interrupt_callback, NULL); + &h->interrupt_callback, options); if (ret) goto fail; c->fd = ffurl_get_file_handle(c->tcp); @@ -395,7 +395,7 @@ static int tls_close(URLContext *h) URLProtocol ff_tls_protocol = { .name = "tls", - .url_open = tls_open, + .url_open2 = tls_open, .url_read = tls_read, .url_write = tls_write, .url_close = tls_close, |