Michael Niedermayer 0d487654ea 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>
2014-03-12 04:43:21 +01:00
..
2014-03-07 17:07:37 -05:00
2014-03-11 01:21:56 +01:00
2013-01-06 16:30:02 +01:00
2012-12-21 00:18:34 +01:00
2014-03-01 03:34:59 +01:00
2013-08-29 22:52:04 +02:00
2013-02-14 23:45:48 +01:00