ffmpeg roll of source to mar 9 version...

patched-ffmpeg-mt/doc/ffmpeg-doc.texi

 \input texinfo @c -*- texinfo -*-
 
 @settitle FFmpeg Documentation
 @titlepage
 @sp 7
 @center @titlefont{FFmpeg Documentation}
 @sp 3
 @end titlepage
 
 
@@ skipping 204 matching lines @@
 @end example
 
 The format option may be needed for raw input files.
 
 By default, FFmpeg tries to convert as losslessly as possible: It
 uses the same audio and video parameters for the outputs as the one
 specified for the inputs.
 @c man end
 
 @c man begin OPTIONS
+
+@include fftools-common-opts.texi
+
 @section Main options
 
 @table @option
-@include fftools-common-opts.texi
 
 @item -f @var{fmt}
 Force format.
 
 @item -i @var{filename}
 input file name
 
 @item -y
 Overwrite output files.
 
@@ skipping 486 matching lines @@
 @item -map @var{input_stream_id}[:@var{sync_stream_id}]
 Set stream mapping from input streams to output streams.
 Just enumerate the input streams in the order you want them in the output.
 @var{sync_stream_id} if specified sets the input stream to sync
 against.
 @item -map_meta_data @var{outfile}:@var{infile}
 Set meta data information of @var{outfile} from @var{infile}.
 @item -debug
 Print specific debug info.
 @item -benchmark
-Add timings for benchmarking.
+Show benchmarking information at the end of an encode.
+Shows CPU time used and maximum memory consumption.
+Maximum memory consumption is not supported on all systems,
+it will usually display as 0 if not supported.
 @item -dump
 Dump each input packet.
 @item -hex
 When dumping packets, also dump the payload.
 @item -bitexact
 Only use bit exact algorithms (for codec testing).
 @item -ps @var{size}
 Set RTP payload size in bytes.
 @item -re
 Read input at native frame rate. Mainly used to simulate a grab device.
@@ skipping 189 matching lines @@
 '-qscale n' when 'n' is between 1 (excellent quality) and 31 (worst
 quality).
 
 @item When converting video files, you can use the '-sameq' option which
 uses the same quality factor in the encoder as in the decoder.
 It allows almost lossless encoding.
 
 @end itemize
 
 @bye