[FFmpeg-cvslog] Merge commit 'eb9244f20210fd420fb9b3c98126f9cae525d1cc'

Michael Niedermayer git at videolan.org
Mon Aug 4 14:22:23 CEST 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Aug  4 14:13:45 2014 +0200| [491c52d3b077dc1f298322a719059398a5f76af8] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=491c52d3b077dc1f298322a719059398a5f76af8
---





More information about the ffmpeg-cvslog mailing list