[FFmpeg-cvslog] Merge commit '7601f9412a2d3387617a45966b65b452a632c27a'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Aug 13 22:47:35 2014 +0200| [69a5cd9feac5382c378ff1613f586b37f34d8961] | committer: Michael Niedermayer

Merge commit '7601f9412a2d3387617a45966b65b452a632c27a'

* commit '7601f9412a2d3387617a45966b65b452a632c27a':
  http: export icecast metadata as an option with name "metadata".

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

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