summaryrefslogtreecommitdiff
path: root/libavformat/icecast.c
Commit message (Collapse)AuthorAge
* Merge commit 'eb9244f20210fd420fb9b3c98126f9cae525d1cc'Michael Niedermayer2014-08-04
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * Add Icecast protocolMarvin Scholz2014-08-04
| | | | | | Icecast is basically a convenience wrapper around the HTTP protocol. Signed-off-by: Martin Storsjö <martin@martin.st>
* libavformat: Add Icecast protocolePirat2014-08-04
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>