diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-03-15 16:18:40 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-03-15 16:48:42 +0100 |
| commit | 6947b0c42e0649f0c8355442d1732d642e467902 (patch) | |
| tree | bffb2d72049108372cbe46273998f3790dc860f0 /doc | |
| parent | 27293b840ccae95ddb1f4d8af519e7962b0e373d (diff) | |
| parent | c76374c6db5f486672f9df223f43e4892bd655c9 (diff) | |
| download | ffmpeg-streaming-6947b0c42e0649f0c8355442d1732d642e467902.zip ffmpeg-streaming-6947b0c42e0649f0c8355442d1732d642e467902.tar.gz | |
Merge remote-tracking branch 'newdev/master'
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/protocols.texi | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/doc/protocols.texi b/doc/protocols.texi index 29f5c90..5655b10 100644 --- a/doc/protocols.texi +++ b/doc/protocols.texi @@ -19,6 +19,22 @@ 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 using the "+" +specifier. + +@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. |
