summaryrefslogtreecommitdiffstats
path: root/doc/demuxers.texi
diff options
context:
space:
mode:
authorJun Zhao <barryjzhao@tencent.com>2019-04-12 18:54:47 +0800
committerJun Zhao <barryjzhao@tencent.com>2019-04-15 21:36:45 +0800
commitabfeba97241e3cd485580b66b8b712d9a9779888 (patch)
treefafd0499fee35008eb3db27301bfcd75b54f43e8 /doc/demuxers.texi
parent32148b5ac96b32a1086cf88db2cf18115fab314c (diff)
downloadffmpeg-streaming-abfeba97241e3cd485580b66b8b712d9a9779888.zip
ffmpeg-streaming-abfeba97241e3cd485580b66b8b712d9a9779888.tar.gz
lavf/hls: Cleanup the applehttp
Cleanup the applehttp as demuxer name, when use the command : ffmpeg -formats, get the confused information like: " E hls Apple HTTP Live Streaming D hls,applehttp Apple HTTP Live Streaming " we don't use applehttp as the demuxer/muxer name usually, so cleanup the applehttp and update the documents. After the change, get the information from "ffmpeg -formats": " DE hls Apple HTTP Live Streaming " Reviewed-by: Steven Liu <lq@onvideo.cn> Signed-off-by: Jun Zhao <barryjzhao@tencent.com>
Diffstat (limited to 'doc/demuxers.texi')
-rw-r--r--doc/demuxers.texi20
1 files changed, 9 insertions, 11 deletions
diff --git a/doc/demuxers.texi b/doc/demuxers.texi
index 2b0b37b..57d1532 100644
--- a/doc/demuxers.texi
+++ b/doc/demuxers.texi
@@ -25,17 +25,6 @@ Audible Format 2, 3, and 4 demuxer.
This demuxer is used to demux Audible Format 2, 3, and 4 (.aa) files.
-@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.
-The total bitrate of the variant that the stream belongs to is
-available in a metadata key named "variant_bitrate".
-
@section apng
Animated Portable Network Graphics demuxer.
@@ -320,6 +309,15 @@ infinitely.
HLS demuxer
+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.
+The total bitrate of the variant that the stream belongs to is
+available in a metadata key named "variant_bitrate".
+
It accepts the following options:
@table @option
OpenPOWER on IntegriCloud