highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit '82a3e469c6584e6d9e56a3fc38eb001d0650defa' into release/2.2

Browse Source 
* commit '82a3e469c6584e6d9e56a3fc38eb001d0650defa':
  http: Improve options descriptions

Conflicts:
	doc/protocols.texi
	libavformat/http.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2014-03-16 04:02:57 +01:00
parent e727cbf0be 82a3e469c6
commit 2513314912
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
doc/protocols.texi
View File

@@ -223,12 +223,18 @@ if set to -1 it will try to autodetect if it is seekable. Default
value is -1. value is -1.
@item chunked_post @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 @item headers
Set custom HTTP headers, can override built in default headers. The Set custom HTTP headers, can override built in default headers. The
value must be a string encoding the headers. 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 @item content_type
Force a 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 Override the User-Agent header. If not specified the protocol will use a
string describing the libavformat build. ("Lavf/<version>") 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 @item timeout
Set timeout of socket I/O operations used by the underlying low level 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 operation. By default it is set to -1, which means that the timeout is