[FFmpeg-cvslog] Merge commit '8075c3d8bb1f6aade0cc7c5c40db9bc1bcd84cab'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Mar 12 03:16:21 2014 +0100| [ca2369cdee0d75708626d539e9eb8eb7e6f9cce3] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ca2369cdee0d75708626d539e9eb8eb7e6f9cce3
---