Michael Niedermayer 491c52d3b0 Merge commit 'eb9244f20210fd420fb9b3c98126f9cae525d1cc' ...

* 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>

2014-08-04 14:14:13 +02:00

7.3 KiB

Raw Blame History

View Raw