avutil: remove deprecated AVClass.child_class_next

[ffmpeg] / libavformat / tls.c

diff --git a/libavformat/tls.c b/libavformat/tls.c
index 10e0792e292c3276c0283744879f632642ed3961..302c0f8d593cc516ea201c50730cd53d1ef11cbd 100644 (file)
--- a/libavformat/tls.c
+++ b/libavformat/tls.c
@@ -89,7 +89,7 @@ int ff_tls_open_underlying(TLSShared *c, URLContext *parent, const char *uri, AV
     if (!c->host && !(c->host = av_strdup(c->underlying_host)))
         return AVERROR(ENOMEM);
 
-    proxy_path = getenv("http_proxy");
+    proxy_path = c->http_proxy ? c->http_proxy : getenv("http_proxy");
     use_proxy = !ff_http_match_no_proxy(getenv("no_proxy"), c->underlying_host) &&
                 proxy_path && av_strstart(proxy_path, "http://", NULL);