diff options
author | Stefano Sabatini <stefasab@gmail.com> | 2013-06-29 16:09:47 +0400 |
---|---|---|
committer | Stefano Sabatini <stefasab@gmail.com> | 2013-06-29 16:12:11 +0400 |
commit | d47168e729d698289360a43efc49fde00b54fd46 (patch) | |
tree | cfd7e3ce69a4be46a76d2840b9483bbb370f197c /doc/muxers.texi | |
parent | f150db096d9d751cb3cbc0d45227c73ccb75fd51 (diff) |
doc/muxers: apply various minor fixes to segment documentation
Diffstat (limited to 'doc/muxers.texi')
-rw-r--r-- | doc/muxers.texi | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/doc/muxers.texi b/doc/muxers.texi index d9933e1e7f..fff9069fec 100644 --- a/doc/muxers.texi +++ b/doc/muxers.texi @@ -597,7 +597,7 @@ Set the reference stream, as specified by the string @var{specifier}. If @var{specifier} is set to @code{auto}, the reference is choosen automatically. Otherwise it must be a stream specifier (see the ``Stream specifiers'' chapter in the ffmpeg manual) which specifies the -reference stream. The default value is ``auto''. +reference stream. The default value is @code{auto}. @item segment_format @var{format} Override the inner container format, by default it is guessed by the filename @@ -611,7 +611,7 @@ listfile is generated. Set flags affecting the segment list generation. It currently supports the following flags: -@table @var +@table @samp @item cache Allow caching (only affects M3U8 list files). @@ -619,18 +619,18 @@ Allow caching (only affects M3U8 list files). Allow live-friendly file generation. @end table -Default value is @code{cache}. +Default value is @code{samp}. @item segment_list_size @var{size} Update the list file so that it contains at most the last @var{size} segments. If 0 the list file will contain all the segments. Default value is 0. -@item segment_list type @var{type} +@item segment_list_type @var{type} Specify the format for the segment list file. The following values are recognized: -@table @option +@table @samp @item flat Generate a flat list for the created segments, one segment per line. @@ -651,7 +651,7 @@ the segment start and end time expressed in seconds. A list file with the suffix @code{".csv"} or @code{".ext"} will auto-select this format. -@code{ext} is deprecated in favor or @code{csv}. +@samp{ext} is deprecated in favor or @samp{csv}. @item ffconcat Generate an ffconcat file for the created segments. The resulting file @@ -745,9 +745,9 @@ ffmpeg -i in.mkv -codec copy -map 0 -f segment -segment_list out.csv -segment_ti @end example @item -As the example above, but use the @code{ffmpeg} @var{force_key_frames} +As the example above, but use the @command{ffmpeg} @option{force_key_frames} option to force key frames in the input at the specified location, together -with the segment option @var{segment_time_delta} to account for +with the segment option @option{segment_time_delta} to account for possible roundings operated when setting key frame times. @example ffmpeg -i in.mkv -force_key_frames 1,2,3,5,8,13,21 -codec:v mpeg4 -codec:a pcm_s16le -map 0 \ @@ -758,7 +758,7 @@ required. @item Segment the input file by splitting the input file according to the -frame numbers sequence specified with the @var{segment_frames} option: +frame numbers sequence specified with the @option{segment_frames} option: @example ffmpeg -i in.mkv -codec copy -map 0 -f segment -segment_list out.csv -segment_frames 100,200,300,500,800 out%03d.nut @end example |