Merge commit 'eb9244f20210fd420fb9b3c98126f9cae525d1cc'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 4 Aug 2014 12:13:45 +0000 (14:13 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 4 Aug 2014 12:14:13 +0000 (14:14 +0200)
commit491c52d3b077dc1f298322a719059398a5f76af8
treefd1c32bfdcc217e39a7a31aa5b07ffee3491cff7
parente3dc2c86fc4178b100484c54f12c88705cdf6724
parenteb9244f20210fd420fb9b3c98126f9cae525d1cc
Merge commit 'eb9244f20210fd420fb9b3c98126f9cae525d1cc'

* commit 'eb9244f20210fd420fb9b3c98126f9cae525d1cc':
  Add Icecast protocol

Conflicts:
Changelog
configure
doc/protocols.texi
libavformat/icecast.c
libavformat/version.h

See: e3dc2c86fc4178b100484c54f12c88705cdf6724
Merged-by: Michael Niedermayer <michaelni@gmx.at>
configure
doc/protocols.texi
libavformat/icecast.c
libavformat/version.h