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

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