diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-03-17 16:53:58 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-03-17 17:22:52 +0100 |
| commit | 0fecf2642b9d909820683647c70031a954f5e58d (patch) | |
| tree | 36ca02de9fa27a049829fb589517223d2d0ce5f5 /doc/protocols.texi | |
| parent | e309fdc7018a1027d187ec27fb1d69a41a4ee167 (diff) | |
| parent | f1f60f5252b0b448adcce0c1c52f3161ee69b9bf (diff) | |
| download | ffmpeg-0fecf2642b9d909820683647c70031a954f5e58d.tar.gz | |
Merge remote-tracking branch 'newdev/master'
Conflicts:
Changelog
doc/APIchanges
doc/optimization.txt
libavformat/avio.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/protocols.texi')
| -rw-r--r-- | doc/protocols.texi | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/doc/protocols.texi b/doc/protocols.texi index 5655b10180..a17d66362a 100644 --- a/doc/protocols.texi +++ b/doc/protocols.texi @@ -1,10 +1,10 @@ @chapter Protocols @c man begin PROTOCOLS -Protocols are configured elements in FFmpeg which allow to access +Protocols are configured elements in Libav which allow to access resources which require the use of a particular protocol. -When you configure your FFmpeg build, all the supported protocols are +When you configure your Libav build, all the supported protocols are enabled by default. You can list all available ones using the configure option "--list-protocols". @@ -25,8 +25,9 @@ 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. +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 @@ -34,7 +35,6 @@ applehttp+http://host/path/to/remote/resource.m3u8 applehttp+file://path/to/local/resource.m3u8 @end example - @section concat Physical concatenation protocol. |