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>

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,