Merge commit '7e38903b5c86a759549e70647ae42bb22d353b14'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 13 Aug 2014 20:54:31 +0000 (22:54 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 13 Aug 2014 20:54:31 +0000 (22:54 +0200)
commit313d75cd4300316f6c8de7ef3473275f454e986a
treede3cb7f5e52c196d78ceb9dd140dd25399255203
parent69a5cd9feac5382c378ff1613f586b37f34d8961
parent7e38903b5c86a759549e70647ae42bb22d353b14
Merge commit '7e38903b5c86a759549e70647ae42bb22d353b14'

* commit '7e38903b5c86a759549e70647ae42bb22d353b14':
  http: enable icy metadata by default.

Conflicts:
Changelog
libavformat/http.c

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