[FFmpeg-cvslog] Merge commit '7e38903b5c86a759549e70647ae42bb22d353b14'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Aug 13 22:54:31 2014 +0200| [313d75cd4300316f6c8de7ef3473275f454e986a] | committer: Michael Niedermayer

Merge commit '7e38903b5c86a759549e70647ae42bb22d353b14'

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

Conflicts:
	Changelog
	libavformat/http.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

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