diff options
Diffstat (limited to 'doc')
-rw-r--r-- | doc/general.texi | 4 | ||||
-rw-r--r-- | doc/protocols.texi | 36 |
2 files changed, 24 insertions, 16 deletions
diff --git a/doc/general.texi b/doc/general.texi index 669c2287f7..42ce322c86 100644 --- a/doc/general.texi +++ b/doc/general.texi @@ -143,6 +143,8 @@ library: @tab Multimedia format used by Delphine Software games. @item CD+G @tab @tab X @tab Video format used by CD+G karaoke disks +@item Commodore CDXL @tab @tab X + @tab Amiga CD video format @item Core Audio Format @tab X @tab X @tab Apple Core Audio Format @item CRC testing format @tab X @tab @@ -460,6 +462,8 @@ following image formats are supported: @tab fourcc: CSCD @item CD+G @tab @tab X @tab Video codec for CD+G karaoke disks +@item CDXL @tab @tab X + @tab Amiga CD video codec @item Chinese AVS video @tab E @tab X @tab AVS1-P2, JiZhun profile, encoding through external library libxavs @item Delphine Software International CIN video @tab @tab X diff --git a/doc/protocols.texi b/doc/protocols.texi index da0e39f56c..13aae78215 100644 --- a/doc/protocols.texi +++ b/doc/protocols.texi @@ -19,22 +19,6 @@ supported protocols. A description of the currently available protocols follows. -@section applehttp - -Read Apple HTTP Live Streaming compliant segmented stream as -a uniform one. The M3U8 playlists describing the segments can be -remote HTTP resources or local files, accessed using the standard -file protocol. -HTTP is default, specific protocol can be declared by specifying -"+@var{proto}" after the applehttp URI scheme name, where @var{proto} -is either "file" or "http". - -@example -applehttp://host/path/to/remote/resource.m3u8 -applehttp+http://host/path/to/remote/resource.m3u8 -applehttp+file://path/to/local/resource.m3u8 -@end example - @section concat Physical concatenation protocol. @@ -81,6 +65,26 @@ specified with the name "FILE.mpeg" is interpreted as the URL Gopher protocol. +@section hls + +Read Apple HTTP Live Streaming compliant segmented stream as +a uniform one. The M3U8 playlists describing the segments can be +remote HTTP resources or local files, accessed using the standard +file protocol. +The nested protocol is declared by specifying +"+@var{proto}" after the hls URI scheme name, where @var{proto} +is either "file" or "http". + +@example +hls+http://host/path/to/remote/resource.m3u8 +hls+file://path/to/local/resource.m3u8 +@end example + +Using this protocol is discouraged - the hls demuxer should work +just as well (if not, please report the issues) and is more complete. +To use the hls demuxer instead, simply use the direct URLs to the +m3u8 files. + @section http HTTP (Hyper Text Transfer Protocol). |