[FFmpeg-cvslog] lavf/http: Add httpproxy to the default protocol whitelist.

[Carl Eugen Hoyos]

ffmpeg | branch: release/3.0 | Carl Eugen Hoyos <cehoyos at ag.or.at> | Mon Mar 14 16:33:57 2016 +0100| [9da31a03738f1456020ac164f8982b4367d18536] | committer: Carl Eugen Hoyos

lavf/http: Add httpproxy to the default protocol whitelist.
(cherry picked from commit 58fa694978735e30f433f8ede6c7f808b9409919)

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9da31a03738f1456020ac164f8982b4367d18536
---

 libavformat/http.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavformat/http.c b/libavformat/http.c
index d1b91e2..3dad2ef 100644
--- a/libavformat/http.c
+++ b/libavformat/http.c
@@ -1522,7 +1522,7 @@ 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 @@ 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 */