* commit 'eb9244f20210fd420fb9b3c98126f9cae525d1cc': Add Icecast protocol Conflicts: Changelog configure doc/protocols.texi libavformat/icecast.c libavformat/version.h See: e3dc2c86fc Merged-by: Michael Niedermayer <michaelni@gmx.at>
e3dc2c86fc
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Icecast is basically a convenience wrapper around the HTTP protocol. Signed-off-by: Martin Storsjö <martin@martin.st>