Michael Niedermayer ca2369cdee Merge commit '8075c3d8bb1f6aade0cc7c5c40db9bc1bcd84cab'
* commit '8075c3d8bb1f6aade0cc7c5c40db9bc1bcd84cab':
  http: Add support reading ICY metadata

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

See: a92fbe16f2dc118c0d3adc222484268831388648
See: 636273d3d4a8c42f51832e8bf83e566e875916bf
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-12 03:18:12 +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