X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=doc%2Fmuxers.texi;h=bb8a8f52b7453750b86e46e4e3c21a50b1af6b93;hb=41181bc4a01188c8f9b0366d77ddeed1e0845c53;hp=9c5f0a93a9b6bbaf925b6a6e948133e9c96e046c;hpb=47b8871ca6f9da4c0467466a43d204dec7fcbd4a;p=ffmpeg

diff --git a/doc/muxers.texi b/doc/muxers.texi
index 9c5f0a93a9b..bb8a8f52b74 100644
--- a/doc/muxers.texi
+++ b/doc/muxers.texi
@@ -24,6 +24,28 @@ A description of some of the currently available muxers follows.
 
 A64 muxer for Commodore 64 video. Accepts a single @code{a64_multi} or @code{a64_multi5} codec video stream.
 
+@anchor{adts}
+@section adts
+
+Audio Data Transport Stream muxer. It accepts a single AAC stream.
+
+@subsection Options
+
+It accepts the following options:
+
+@table @option
+
+@item write_id3v2 @var{bool}
+Enable to write ID3v2.4 tags at the start of the stream. Default is disabled.
+
+@item write_apetag @var{bool}
+Enable to write APE tags at the end of the stream. Default is disabled.
+
+@item write_mpeg2 @var{bool}
+Enable to set MPEG version bit in the ADTS frame header to 1 which indicates MPEG-2. Default is 0, which indicates MPEG-4.
+
+@end table
+
 @anchor{aiff}
 @section aiff
 
@@ -43,6 +65,37 @@ ID3v2.3 and ID3v2.4) are supported. The default is version 4.
 
 @end table
 
+@anchor{alp}
+@section alp
+
+Muxer for audio of High Voltage Software's Lego Racers game. It accepts a single ADPCM_IMA_ALP stream
+with no more than 2 channels nor a sample rate greater than 44100 Hz.
+
+Extensions: tun, pcm
+
+@subsection Options
+
+It accepts the following options:
+
+@table @option
+
+@item type @var{type}
+Set file type.
+
+@table @samp
+@item tun
+Set file type as music. Must have a sample rate of 22050 Hz.
+
+@item pcm
+Set file type as sfx.
+
+@item auto
+Set file type as per output file extension. @code{.pcm} results in type @code{pcm} else type @code{tun} is set. @var{(default)}
+
+@end table
+
+@end table
+
 @anchor{asf}
 @section asf
 
@@ -748,15 +801,6 @@ Set output format options using a :-separated list of key=value
 parameters. Values containing @code{:} special characters must be
 escaped.
 
-@item hls_wrap @var{wrap}
-This is a deprecated option, you can use @code{hls_list_size}
-and @code{hls_flags delete_segments} instead it
-
-This option is useful to avoid to fill the disk with many segment
-files, and limits the maximum number of segment files written to disk
-to @var{wrap}.
-
-
 @item hls_start_number_source
 Start the playlist sequence number (@code{#EXT-X-MEDIA-SEQUENCE}) according to the specified source.
 Unless @code{hls_flags single_file} is set, it also specifies source of starting sequence numbers of
@@ -2017,7 +2061,7 @@ No extension is registered so format name has to be supplied e.g. with the ffmpe
 @subsection data
 
 Data muxer accepts a single stream with any codec of any type.
-The input stream has to be selected using the @code {-map} option with the ffmpeg CLI tool.
+The input stream has to be selected using the @code{-map} option with the ffmpeg CLI tool.
 
 No extension is registered so format name has to be supplied e.g. with the ffmpeg CLI tool @code{-f data}.