[FFmpeg-cvslog] doc: Move the hls protocol section into the right place
Martin Storsjö
git at videolan.org
Wed Feb 15 02:14:07 CET 2012
ffmpeg | branch: master | Martin Storsjö <martin at martin.st> | Tue Feb 14 12:04:50 2012 +0200| [3975ca8957be408c118f101e0a44c6554a329667] | committer: Martin Storsjö
doc: Move the hls protocol section into the right place
Signed-off-by: Martin Storsjö <martin at martin.st>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3975ca8957be408c118f101e0a44c6554a329667
---
doc/protocols.texi | 30 +++++++++++++++---------------
1 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/doc/protocols.texi b/doc/protocols.texi
index e00c1e1..6268860 100644
--- a/doc/protocols.texi
+++ b/doc/protocols.texi
@@ -19,21 +19,6 @@ supported protocols.
A description of the currently available protocols follows.
- at 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
-"+ at var{proto}" after the hls URI scheme name, where @var{proto}
-is either "file" or "http".
-
- at example
-hls+http://host/path/to/remote/resource.m3u8
-hls+file://path/to/local/resource.m3u8
- at end example
-
@section concat
Physical concatenation protocol.
@@ -80,6 +65,21 @@ specified with the name "FILE.mpeg" is interpreted as the URL
Gopher protocol.
+ at 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
+"+ at var{proto}" after the hls URI scheme name, where @var{proto}
+is either "file" or "http".
+
+ at example
+hls+http://host/path/to/remote/resource.m3u8
+hls+file://path/to/local/resource.m3u8
+ at end example
+
@section http
HTTP (Hyper Text Transfer Protocol).
More information about the ffmpeg-cvslog
mailing list