X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavformat%2Ftls.c;h=302c0f8d593cc516ea201c50730cd53d1ef11cbd;hb=339af976b6fd9c05d1e75e75a5323efdb3d6afa1;hp=10e0792e292c3276c0283744879f632642ed3961;hpb=c6892f59eb0e9f2a9ec1f55b21a5841a60540e1f;p=ffmpeg

diff --git a/libavformat/tls.c b/libavformat/tls.c
index 10e0792e292..302c0f8d593 100644
--- 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);