-
Michael Niedermayer authored
* commit 'eb9244f2': Add Icecast protocol Conflicts: Changelog configure doc/protocols.texi libavformat/icecast.c libavformat/version.h See: e3dc2c86Merged-by: Michael Niedermayer <michaelni@gmx.at>
491c52d3
* commit 'eb9244f2': Add Icecast protocol Conflicts: Changelog configure doc/protocols.texi libavformat/icecast.c libavformat/version.h See: e3dc2c86Merged-by: Michael Niedermayer <michaelni@gmx.at>