Merge commit '9d74012761bc3ee676fe43321d5699e4877fde5b'

[ffmpeg] / doc / protocols.texi

diff --git a/doc/protocols.texi b/doc/protocols.texi
index 7c6b9d463d40084cc3027483a58143e51ca753ed..8b2e310b0a848c28d776a8fed0bfa26e967e4534 100644 (file)
--- 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.