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>

diff --cc doc/protocols.texi
index 90745c584d0b4960d024f716bbae3f34e2d76b2c,597693af29125b79ffb0f0f3e0ed617cfb78fe17..5798f75a37f04e324551c3faf8047509ef76f3d9
--- 1/doc/protocols.texi
--- 2/doc/protocols.texi
+++ b/doc/protocols.texi
@@@ -216,37 -92,22 +216,37 @@@ HTTP (Hyper Text Transfer Protocol)
  This protocol accepts the following options:
  
  @table @option
 +@item seekable
 +Control seekability of connection. If set to 1 the resource is
 +supposed to be seekable, if set to 0 it is assumed not to be seekable,
 +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.
 +
 +@item user-agent
  @item user_agent
 -Override the User-Agent header. If not specified a string of the form
 -"Lavf/<version>" will be used.
 +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
 +not specified.
  
  @item mime_type
  Export the MIME type.