Merge commit '7601f9412a2d3387617a45966b65b452a632c27a'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 13 Aug 2014 20:47:35 +0000 (22:47 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 13 Aug 2014 20:52:53 +0000 (22:52 +0200)
commit69a5cd9feac5382c378ff1613f586b37f34d8961
treecd150a2eee6fac15bcd4871c16f7c6def1e9d4ec
parent2ba45778095cdd6e1438644e4797b76e9de6c672
parent7601f9412a2d3387617a45966b65b452a632c27a
Merge commit '7601f9412a2d3387617a45966b65b452a632c27a'

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

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