diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-12 04:41:48 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-12 04:43:21 +0100 |
| commit | 0d487654ea8515d916f5d3b9e208fe39d9723fc5 (patch) | |
| tree | f019b6d3cc2dc16da9ce2fc8f42ccd940fabbc76 | |
| parent | 1cc9468289b266e4a8ff62d520be832f103f0afa (diff) | |
| parent | fe568b3d27ca2c5cca3878b2a7a3a968e605aec4 (diff) | |
| download | ffmpeg-0d487654ea8515d916f5d3b9e208fe39d9723fc5.tar.gz | |
Merge commit 'fe568b3d27ca2c5cca3878b2a7a3a968e605aec4'
* commit 'fe568b3d27ca2c5cca3878b2a7a3a968e605aec4':
http: Improve options descriptions
Conflicts:
doc/protocols.texi
libavformat/http.c
See: 255ec768da6f6e821775888621da2156764598da
See: 0a7cd740438b46e3b9fbf406ca5a948a6f027c97
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | doc/protocols.texi | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/doc/protocols.texi b/doc/protocols.texi index 90745c584d..5798f75a37 100644 --- a/doc/protocols.texi +++ b/doc/protocols.texi @@ -223,12 +223,18 @@ if set to -1 it will try to autodetect if it is seekable. Default value is -1. @item chunked_post -If set to 1 use chunked transfer-encoding for posts, default is 1. +If set to 1 use chunked Transfer-Encoding for posts, default is 1. @item headers Set custom HTTP headers, can override built in default headers. The value must be a string encoding the headers. +@item multiple_requests +Use persistent connections if set to 1, default is 0. + +@item post_data +Set custom HTTP post data. + @item content_type Force a content type. @@ -237,12 +243,6 @@ Force a content type. Override the User-Agent header. If not specified the protocol will use a string describing the libavformat build. ("Lavf/<version>") -@item multiple_requests -Use persistent connections if set to 1. By default it is 0. - -@item post_data -Set custom HTTP post data. - @item timeout Set timeout of socket I/O operations used by the underlying low level operation. By default it is set to -1, which means that the timeout is |