diff options
author | Marvin Scholz <epirat07@gmail.com> | 2014-07-28 11:55:38 +0200 |
---|---|---|
committer | Martin Storsjö <martin@martin.st> | 2014-08-04 12:56:42 +0300 |
commit | eb9244f20210fd420fb9b3c98126f9cae525d1cc (patch) | |
tree | 4bb228dfbd061baf31378385259ced79dcf1a58a /doc | |
parent | bb41115d56930b9f5d59e79dca254d1201246967 (diff) | |
download | ffmpeg-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')
-rw-r--r-- | doc/general.texi | 1 | ||||
-rw-r--r-- | doc/protocols.texi | 40 |
2 files changed, 41 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 diff --git a/doc/protocols.texi b/doc/protocols.texi index 1501dab60c..ec7d92440a 100644 --- a/doc/protocols.texi +++ b/doc/protocols.texi @@ -138,6 +138,46 @@ Set initial byte offset. Try to limit the request to bytes preceding this offset. @end table +@section Icecast + +Icecast (stream to Icecast servers) + +This protocol accepts the following options: + +@table @option +@item ice_genre +Set the stream genre. + +@item ice_name +Set the stream name. + +@item ice_description +Set the stream description. + +@item ice_url +Set the stream website URL. + +@item ice_public +Set if the stream should be public or not. +The default is 0 (not public). + +@item user_agent +Override the User-Agent header. If not specified a string of the form +"Lavf/<version>" will be used. + +@item password +Set the Icecast mountpoint password. + +@item content_type +Set the stream content type. This must be set if it is different from +audio/mpeg. + +@item legacy_icecast +This enables support for Icecast versions < 2.4.0, that do not support the +HTTP PUT method but the SOURCE method. + +@end table + @section mmst MMS (Microsoft Media Server) protocol over TCP. |