[FFmpeg-cvslog] avformat/http: Documented http_proxy option

[Joel Holdsworth]

ffmpeg | branch: master | Joel Holdsworth <joel at airwebreathe.org.uk> | Mon Dec 28 09:50:15 2015 +0000| [b9c46b5242bf338f6e57bc6a4380e69be83c058c] | committer: Michael Niedermayer

avformat/http: Documented http_proxy option

Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

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

 doc/protocols.texi |    3 +++
 1 file changed, 3 insertions(+)

diff --git a/doc/protocols.texi b/doc/protocols.texi
index 7c6b9d4..8b2e310 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.
 
+ at 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.