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-12-14 21:47:51 +01:00
2014-01-09 12:12:10 +01:00
2014-01-30 15:19:51 +01:00
2013-11-28 10:27:25 +01:00
2014-03-06 21:12:40 +01:00
2013-12-23 12:52:50 +01:00
2014-01-09 12:12:10 +01:00
2014-02-17 02:22:01 +01:00
2014-02-14 14:38:21 +01:00
2014-03-06 21:12:40 +01:00
2014-01-03 17:05:44 +01:00
2014-03-06 21:12:40 +01:00
2014-03-06 21:12:40 +01:00
2014-02-24 09:15:46 +01:00
2014-02-10 13:26:31 +01:00
2014-01-09 12:12:10 +01:00
2013-12-15 10:46:46 +01:00
2013-12-16 19:18:45 +01:00
2014-01-03 17:03:43 +01:00
2013-12-29 22:57:20 +01:00
2014-03-06 21:12:40 +01:00
2014-02-24 19:46:11 +01:00
2014-03-11 21:24:54 +01:00
2014-03-06 21:12:40 +01:00
2014-03-06 21:12:40 +01:00
2014-02-25 20:26:00 +01:00
2014-03-06 21:12:40 +01:00
2014-03-06 21:12:40 +01:00
2013-11-27 13:39:42 +00:00
2014-03-12 04:43:21 +01:00
2014-03-01 03:34:59 +01:00
2014-02-25 09:02:57 +01:00
2013-12-06 10:40:38 +01:00
2014-03-06 21:12:40 +01:00