aboutsummaryrefslogtreecommitdiffstats
path: root/doc/general.texi
diff options
context:
space:
mode:
authorMarvin Scholz <epirat07@gmail.com>2014-07-28 11:55:38 +0200
committerMartin Storsjö <martin@martin.st>2014-08-04 12:56:42 +0300
commiteb9244f20210fd420fb9b3c98126f9cae525d1cc (patch)
tree4bb228dfbd061baf31378385259ced79dcf1a58a /doc/general.texi
parentbb41115d56930b9f5d59e79dca254d1201246967 (diff)
downloadffmpeg-eb9244f20210fd420fb9b3c98126f9cae525d1cc.tar.gz
Add Icecast protocol
Icecast is basically a convenience wrapper around the HTTP protocol. Signed-off-by: Martin Storsjö <martin@martin.st>
Diffstat (limited to 'doc/general.texi')
-rw-r--r--doc/general.texi1
1 files changed, 1 insertions, 0 deletions
diff --git a/doc/general.texi b/doc/general.texi
index 1fd5f36fd9..ae59941bf6 100644
--- a/doc/general.texi
+++ b/doc/general.texi
@@ -948,6 +948,7 @@ performance on systems without hardware floating point support).
@item HLS @tab X
@item HTTP @tab X
@item HTTPS @tab X
+@item Icecast @tab X
@item MMSH @tab X
@item MMST @tab X
@item pipe @tab X