summaryrefslogtreecommitdiff
path: root/doc/demuxers.texi
diff options
context:
space:
mode:
authorMartin Storsjö <martin@martin.st>2011-04-20 23:04:31 +0300
committerMartin Storsjö <martin@martin.st>2011-04-21 14:13:09 +0300
commitcac275791994be44b7a6d11a3878646e78ab5653 (patch)
treebe63595a2369f64d8f4bc2865bafc43b8370a96a /doc/demuxers.texi
parent23d3931a6a8a37bb7e86bd6cb4709eb46031bfe1 (diff)
downloadffmpeg-cac275791994be44b7a6d11a3878646e78ab5653.tar.gz
doc: Add some initial docs on the applehttp demuxer
Signed-off-by: Martin Storsjö <martin@martin.st>
Diffstat (limited to 'doc/demuxers.texi')
-rw-r--r--doc/demuxers.texi9
1 files changed, 9 insertions, 0 deletions
diff --git a/doc/demuxers.texi b/doc/demuxers.texi
index bbdde9c92d..4168fc10c6 100644
--- a/doc/demuxers.texi
+++ b/doc/demuxers.texi
@@ -64,4 +64,13 @@ Note that the pattern must not necessarily contain "%d" or
ffmpeg -f image2 -i img.jpeg img.png
@end example
+@section applehttp
+
+Apple HTTP Live Streaming demuxer.
+
+This demuxer presents all AVStreams from all variant streams.
+The id field is set to the bitrate variant index number. By setting
+the discard flags on AVStreams (by pressing 'a' or 'v' in ffplay),
+the caller can decide which variant streams to actually receive.
+
@c man end INPUT DEVICES