aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorMartin Storsjö <martin@martin.st>2012-02-14 12:04:50 +0200
committerMartin Storsjö <martin@martin.st>2012-02-14 20:05:32 +0200
commit3975ca8957be408c118f101e0a44c6554a329667 (patch)
treec0ec5bdf094051965bfe4ba921128ecabedc8e97 /doc
parent8bdab32f4ee402bbd7bf5a61b0ccbcc59569bfb0 (diff)
downloadffmpeg-3975ca8957be408c118f101e0a44c6554a329667.tar.gz
doc: Move the hls protocol section into the right place
Signed-off-by: Martin Storsjö <martin@martin.st>
Diffstat (limited to 'doc')
-rw-r--r--doc/protocols.texi30
1 files changed, 15 insertions, 15 deletions
diff --git a/doc/protocols.texi b/doc/protocols.texi
index e00c1e11b2..626886069d 100644
--- a/doc/protocols.texi
+++ b/doc/protocols.texi
@@ -19,21 +19,6 @@ supported protocols.
A description of the currently available protocols follows.
-@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
-
@section concat
Physical concatenation protocol.
@@ -80,6 +65,21 @@ 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
+
@section http
HTTP (Hyper Text Transfer Protocol).