aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/http.c
diff options
context:
space:
mode:
authorCarl Eugen Hoyos <cehoyos@ag.or.at>2016-03-14 16:33:57 +0100
committerCarl Eugen Hoyos <cehoyos@ag.or.at>2016-03-14 16:33:57 +0100
commit58fa694978735e30f433f8ede6c7f808b9409919 (patch)
tree5f1641403b6f06198f99f7b6e257a50fa181c439 /libavformat/http.c
parenta38627be6d61b2309fe1df2dbe1eb6470c22ddc6 (diff)
downloadffmpeg-58fa694978735e30f433f8ede6c7f808b9409919.tar.gz
lavf/http: Add httpproxy to the default protocol whitelist.
Diffstat (limited to 'libavformat/http.c')
-rw-r--r--libavformat/http.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/http.c b/libavformat/http.c
index f18d9e28a1..814ca014ce 100644
--- a/libavformat/http.c
+++ b/libavformat/http.c
@@ -1522,7 +1522,7 @@ const URLProtocol ff_http_protocol = {
.priv_data_size = sizeof(HTTPContext),
.priv_data_class = &http_context_class,
.flags = URL_PROTOCOL_FLAG_NETWORK,
- .default_whitelist = "http,https,tls,rtp,tcp,udp,crypto"
+ .default_whitelist = "http,https,tls,rtp,tcp,udp,crypto,httpproxy"
};
#endif /* CONFIG_HTTP_PROTOCOL */
@@ -1541,7 +1541,7 @@ const URLProtocol ff_https_protocol = {
.priv_data_size = sizeof(HTTPContext),
.priv_data_class = &https_context_class,
.flags = URL_PROTOCOL_FLAG_NETWORK,
- .default_whitelist = "http,https,tls,rtp,tcp,udp,crypto"
+ .default_whitelist = "http,https,tls,rtp,tcp,udp,crypto,httpproxy"
};
#endif /* CONFIG_HTTPS_PROTOCOL */