summaryrefslogtreecommitdiff
path: root/doc/protocols.texi
diff options
context:
space:
mode:
authorMartin Storsjö <martin@martin.st>2012-02-14 12:00:49 +0200
committerMartin Storsjö <martin@martin.st>2012-02-14 20:05:32 +0200
commit8bdab32f4ee402bbd7bf5a61b0ccbcc59569bfb0 (patch)
treee2357084d8c632c275a36b540fb56588678b467d /doc/protocols.texi
parent65cd7bf32f384db919b81b07d8e3201d6af4fb06 (diff)
libavformat: Rename the applehttp protocol to hls
Keep the old protocol name around for backwards compatibility until the next bump. Deprecate the method of implicitly assuming the nested protocol. For applehttp://server/path, it might have felt logical, but supporting hls://server/path isn't quite as intuitive. Therefore only support hls+http://server/path from now on. Using this protocol at all is discouraged, since the hls demuxer is more complete and fits into the architecture better. There have been cases where the protocol implementation worked better than the demuxer, but this should no longer be the case. Signed-off-by: Martin Storsjö <martin@martin.st>
Diffstat (limited to 'doc/protocols.texi')
-rw-r--r--doc/protocols.texi11
1 files changed, 5 insertions, 6 deletions
diff --git a/doc/protocols.texi b/doc/protocols.texi
index f5bb5324be..e00c1e11b2 100644
--- a/doc/protocols.texi
+++ b/doc/protocols.texi
@@ -19,20 +19,19 @@ supported protocols.
A description of the currently available protocols follows.
-@section applehttp
+@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.
-HTTP is default, specific protocol can be declared by specifying
-"+@var{proto}" after the applehttp URI scheme name, where @var{proto}
+The nested protocol is declared by specifying
+"+@var{proto}" after the hls 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
+hls+http://host/path/to/remote/resource.m3u8
+hls+file://path/to/local/resource.m3u8
@end example
@section concat