[FFmpeg-cvslog] doc/muxers: add "Options", "Examples", "Syntax", etc. subsections

Timothy Gu git at videolan.org
Sun Jan 19 13:42:12 CET 2014


ffmpeg | branch: master | Timothy Gu <timothygu99 at gmail.com> | Wed Jan  8 18:30:20 2014 -0800| [56072421559342c959de87a402b9d65de598f41e] | committer: Stefano Sabatini

doc/muxers: add "Options", "Examples", "Syntax", etc. subsections

More consistent with codec docs. Also some minor reorganization of sentences
to fit the new document hierarchy.

Signed-off-by: Timothy Gu <timothygu99 at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=56072421559342c959de87a402b9d65de598f41e
---

 doc/muxers.texi |   41 ++++++++++++++++++++++++++++++++++-------
 1 file changed, 34 insertions(+), 7 deletions(-)

diff --git a/doc/muxers.texi b/doc/muxers.texi
index b83c557..4d88b1c 100644
--- a/doc/muxers.texi
+++ b/doc/muxers.texi
@@ -23,6 +23,8 @@ A description of some of the currently available muxers follows.
 
 Audio Interchange File Format muxer.
 
+ at subsection Options
+
 It accepts the following options:
 
 @table @option
@@ -49,6 +51,10 @@ The output of the muxer consists of a single line of the form:
 CRC=0x at var{CRC}, where @var{CRC} is a hexadecimal number 0-padded to
 8 digits containing the CRC for all the decoded input frames.
 
+See also the @ref{framecrc} muxer.
+
+ at subsection Examples
+
 For example to compute the CRC of the input, and store it in the file
 @file{out.crc}:
 @example
@@ -68,8 +74,6 @@ and the input video converted to MPEG-2 video, use the command:
 ffmpeg -i INPUT -c:a pcm_u8 -c:v mpeg2video -f crc -
 @end example
 
-See also the @ref{framecrc} muxer.
-
 @anchor{framecrc}
 @section framecrc
 
@@ -89,6 +93,8 @@ packet of the form:
 @var{CRC} is a hexadecimal number 0-padded to 8 digits containing the
 CRC of the packet.
 
+ at subsection Examples
+
 For example to compute the CRC of the audio and video frames in
 @file{INPUT}, converted to raw audio and video packets, and store it
 in the file @file{out.crc}:
@@ -132,6 +138,8 @@ packet of the form:
 @var{MD5} is a hexadecimal number representing the computed MD5 hash
 for the packet.
 
+ at subsection Examples
+
 For example to compute the MD5 of the audio and video frames in
 @file{INPUT}, converted to raw audio and video packets, and store it
 in the file @file{out.md5}:
@@ -200,6 +208,8 @@ See also the @ref{segment} muxer, which provides a more generic and
 flexible implementation of a segmenter, and can be used to perform HLS
 segmentation.
 
+ at subsection Options
+
 This muxer supports the following options:
 
 @table @option
@@ -292,6 +302,8 @@ The pattern "img%%-%d.jpg" will specify a sequence of filenames of the
 form @file{img%-1.jpg}, @file{img%-2.jpg}, ..., @file{img%-10.jpg},
 etc.
 
+ at subsection Examples
+
 The following example shows how to use @command{ffmpeg} for creating a
 sequence of files @file{img-001.jpeg}, @file{img-002.jpeg}, ...,
 taking one image every second from the input video:
@@ -354,6 +366,8 @@ Matroska container muxer.
 
 This muxer implements the matroska and webm container specs.
 
+ at subsection Metadata
+
 The recognized metadata settings in this muxer are:
 
 @table @option
@@ -411,6 +425,8 @@ For example a 3D WebM clip can be created using the following command line:
 ffmpeg -i sample_left_right_clip.mpg -an -c:v libvpx -metadata stereo_mode=left_right -y stereo_clip.webm
 @end example
 
+ at subsection Options
+
 This muxer supports the following options:
 
 @table @option
@@ -475,6 +491,8 @@ very long files (since writing normal MOV/MP4 files stores info about
 every single packet in memory until the file is closed). The downside
 is that it is less compatible with other applications.
 
+ at subsection Options
+
 Fragmentation is enabled by setting one of the AVOptions that define
 how to cut the file into fragments:
 
@@ -531,6 +549,8 @@ as fragmented output, thus it is not enabled by default.
 Add RTP hinting tracks to the output file.
 @end table
 
+ at subsection Example
+
 Smooth Streaming content can be pushed in real time to a publishing
 point on IIS with this muxer. Example:
 @example
@@ -587,6 +607,13 @@ MPEG transport stream muxer.
 
 This muxer implements ISO 13818-1 and part of ETSI EN 300 468.
 
+The recognized metadata settings in mpegts muxer are @code{service_provider}
+and @code{service_name}. If they are not set the default for
+ at code{service_provider} is "FFmpeg" and the default for
+ at code{service_name} is "Service01".
+
+ at subsection Options
+
 The muxer options are:
 
 @table @option
@@ -639,10 +666,7 @@ Reemit PAT/PMT before writing the next packet.
 Use LATM packetization for AAC.
 @end table
 
-The recognized metadata settings in mpegts muxer are @code{service_provider}
-and @code{service_name}. If they are not set the default for
- at code{service_provider} is "FFmpeg" and the default for
- at code{service_name} is "Service01".
+ at subsection Example
 
 @example
 ffmpeg -i file.mpg -c copy \
@@ -727,6 +751,8 @@ files.
 See also the @ref{hls} muxer, which provides a more specific
 implementation for HLS segmentation.
 
+ at subsection Options
+
 The segment muxer supports the following options:
 
 @table @option
@@ -970,7 +996,8 @@ specified by a stream specifier. If not specified, this defaults to
 all the input streams.
 @end table
 
-Some examples follow.
+ at subsection Examples
+
 @itemize
 @item
 Encode something and both archive it in a WebM file and stream it



More information about the ffmpeg-cvslog mailing list