tls: Pass AVOptions dictionaries through to the chained protocol

Message ID 1425130675-72945-1-git-send-email-martin@martin.st
State Committed
Headers show

Commit Message

Martin Storsjö Feb. 28, 2015, 1:37 p.m.
---
 libavformat/tls.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Comments

Luca Barbato Feb. 28, 2015, 2:18 p.m. | #1
On 28/02/15 14:37, Martin Storsjö wrote:
> ---
>  libavformat/tls.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 

Seems fine.

Patch

diff --git a/libavformat/tls.c b/libavformat/tls.c
index 6b6dbc4..0a2eb77 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);
+                     &h->interrupt_callback, options, h);
     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,