Merge commit 'e2811c2ede428a20aec3630bef4378f2927fb306' into release/2.2
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 16 Mar 2014 02:30:09 +0000 (03:30 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 16 Mar 2014 02:30:09 +0000 (03:30 +0100)
commitbdb219435e0bf97bc4c40b84417b8e39b4e49f30
tree6c66501b4be9c6b4e5e5d79cbde8e1c4f080e968
parenta7338ae8acf373244ab28e134f0e09fd745cf383
parente2811c2ede428a20aec3630bef4378f2927fb306
Merge commit 'e2811c2ede428a20aec3630bef4378f2927fb306' into release/2.2

* commit 'e2811c2ede428a20aec3630bef4378f2927fb306':
  http: Add support reading ICY metadata

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
doc/protocols.texi
libavformat/http.c