X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavformat%2Ftls_libtls.c;h=911c8094b045798d878364a93641824091c3d950;hb=9e13df3776da3a101e895e2840f6f23f5a6f74a0;hp=1321f79229f8f6f336baf07a0d02e29e5f975009;hpb=725ae0e2d0222f81b5cca3b0b226116ec6fd0494;p=ffmpeg

diff --git a/libavformat/tls_libtls.c b/libavformat/tls_libtls.c
index 1321f79229f..911c8094b04 100644
--- a/libavformat/tls_libtls.c
+++ b/libavformat/tls_libtls.c
@@ -44,8 +44,7 @@ static int ff_tls_close(URLContext *h)
         tls_close(p->ctx);
         tls_free(p->ctx);
     }
-    if (p->tls_shared.tcp)
-        ffurl_close(p->tls_shared.tcp);
+    ffurl_closep(&p->tls_shared.tcp);
     return 0;
 }
 
@@ -119,7 +118,7 @@ static int ff_tls_open(URLContext *h, const char *uri, int flags, AVDictionary *
 
     if (!c->listen) {
         ret = tls_connect_cbs(p->ctx, tls_read_callback, tls_write_callback,
-            c->tcp, !c->numerichost ? c->host : NULL);
+            c->tcp, c->host);
     } else {
         struct tls *ctx_new;
         ret = tls_accept_cbs(p->ctx, &ctx_new, tls_read_callback,
@@ -182,6 +181,12 @@ static int tls_get_file_handle(URLContext *h)
     return ffurl_get_file_handle(c->tls_shared.tcp);
 }
 
+static int tls_get_short_seek(URLContext *h)
+{
+    TLSContext *s = h->priv_data;
+    return ffurl_get_short_seek(s->tls_shared.tcp);
+}
+
 static const AVOption options[] = {
     TLS_COMMON_OPTIONS(TLSContext, tls_shared),
     { NULL }
@@ -201,6 +206,7 @@ const URLProtocol ff_tls_protocol = {
     .url_write      = ff_tls_write,
     .url_close      = ff_tls_close,
     .url_get_file_handle = tls_get_file_handle,
+    .url_get_short_seek  = tls_get_short_seek,
     .priv_data_size = sizeof(TLSContext),
     .flags          = URL_PROTOCOL_FLAG_NETWORK,
     .priv_data_class = &tls_class,