diff options
| author | Martin Storsjö <martin@martin.st> | 2015-02-28 02:15:55 +0200 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2015-02-28 22:08:19 +0200 |
| commit | b9d2d6843a49f9df1d1ae1afe817d9b48c445919 (patch) | |
| tree | 06f209a8cb8e672060999a7f28eb2af00f6b0545 | |
| parent | e14f98c62fdf8744b07419314095d1b3248cce75 (diff) | |
| download | ffmpeg-b9d2d6843a49f9df1d1ae1afe817d9b48c445919.tar.gz | |
tls: Pass AVOptions dictionaries through to the chained protocol
Signed-off-by: Martin Storsjö <martin@martin.st>
| -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 1832f2b3aa..d5de5ee800 100644 --- a/libavformat/tls.c +++ b/libavformat/tls.c @@ -137,7 +137,7 @@ static int do_tls_poll(URLContext *h, int ret) return 0; } -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; @@ -189,7 +189,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); @@ -360,7 +360,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, |