aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoel Holdsworth <joel@airwebreathe.org.uk>2015-12-28 09:50:15 +0000
committerMichael Niedermayer <michael@niedermayer.cc>2015-12-28 16:17:28 +0100
commitb9c46b5242bf338f6e57bc6a4380e69be83c058c (patch)
tree213e29ef592d375f3e1582a9cbf50682263e77bd
parent1b5bd4051d1e394f0429cbf6cf6c137f55857478 (diff)
downloadffmpeg-b9c46b5242bf338f6e57bc6a4380e69be83c058c.tar.gz
avformat/http: Documented http_proxy option
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--doc/protocols.texi3
1 files changed, 3 insertions, 0 deletions
diff --git a/doc/protocols.texi b/doc/protocols.texi
index 7c6b9d463d..8b2e310b0a 100644
--- a/doc/protocols.texi
+++ b/doc/protocols.texi
@@ -240,6 +240,9 @@ If set to 1 use chunked Transfer-Encoding for posts, default is 1.
@item content_type
Set a specific content type for the POST messages.
+@item http_proxy
+set HTTP proxy to tunnel through e.g. http://example.com:1234
+
@item headers
Set custom HTTP headers, can override built in default headers. The
value must be a string encoding the headers.