doc/ffmpeg.texi: merge changes from avconv.texi since last merge
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
parent
0aa793a1be
commit
530cd7a913
@ -82,13 +82,15 @@ described.
|
|||||||
@table @option
|
@table @option
|
||||||
|
|
||||||
@item -f @var{fmt} (@emph{input/output})
|
@item -f @var{fmt} (@emph{input/output})
|
||||||
Force format.
|
Force input or output file format. The format is normally autodetected for input
|
||||||
|
files and guessed from file extension for output files, so this option is not
|
||||||
|
needed in most cases.
|
||||||
|
|
||||||
@item -i @var{filename} (@emph{input})
|
@item -i @var{filename} (@emph{input})
|
||||||
input file name
|
input file name
|
||||||
|
|
||||||
@item -y (@emph{global})
|
@item -y (@emph{global})
|
||||||
Overwrite output files.
|
Overwrite output files without asking.
|
||||||
|
|
||||||
@item -c[:@var{stream_specifier}] @var{codec} (@emph{input/output,per-stream})
|
@item -c[:@var{stream_specifier}] @var{codec} (@emph{input/output,per-stream})
|
||||||
@itemx -codec[:@var{stream_specifier}] @var{codec} (@emph{input/output,per-stream})
|
@itemx -codec[:@var{stream_specifier}] @var{codec} (@emph{input/output,per-stream})
|
||||||
@ -111,9 +113,8 @@ will copy all the streams except the second video, which will be encoded with
|
|||||||
libx264, and the 138th audio, which will be encoded with libvorbis.
|
libx264, and the 138th audio, which will be encoded with libvorbis.
|
||||||
|
|
||||||
@item -t @var{duration} (@emph{output})
|
@item -t @var{duration} (@emph{output})
|
||||||
Restrict the transcoded/captured video sequence
|
Stop writing the output after its duration reaches @var{duration}.
|
||||||
to the duration specified in seconds.
|
@var{duration} may be a number in seconds, or in @code{hh:mm:ss[.xxx]} form.
|
||||||
@code{hh:mm:ss[.xxx]} syntax is also supported.
|
|
||||||
|
|
||||||
@item -fs @var{limit_size} (@emph{output})
|
@item -fs @var{limit_size} (@emph{output})
|
||||||
Set the file size limit.
|
Set the file size limit.
|
||||||
@ -131,7 +132,7 @@ Set the input time offset in seconds.
|
|||||||
@code{[-]hh:mm:ss[.xxx]} syntax is also supported.
|
@code{[-]hh:mm:ss[.xxx]} syntax is also supported.
|
||||||
The offset is added to the timestamps of the input files.
|
The offset is added to the timestamps of the input files.
|
||||||
Specifying a positive offset means that the corresponding
|
Specifying a positive offset means that the corresponding
|
||||||
streams are delayed by 'offset' seconds.
|
streams are delayed by @var{offset} seconds.
|
||||||
|
|
||||||
@item -timestamp @var{time} (@emph{output})
|
@item -timestamp @var{time} (@emph{output})
|
||||||
Set the recording timestamp in the container.
|
Set the recording timestamp in the container.
|
||||||
@ -166,12 +167,14 @@ ffmpeg -i INPUT -metadata:s:1 language=eng OUTPUT
|
|||||||
@end example
|
@end example
|
||||||
|
|
||||||
@item -v @var{number} (@emph{global})
|
@item -v @var{number} (@emph{global})
|
||||||
Set the logging verbosity level.
|
This option is deprecated and has no effect, use -loglevel
|
||||||
|
to set verbosity level.
|
||||||
|
|
||||||
@item -target @var{type} (@emph{output})
|
@item -target @var{type} (@emph{output})
|
||||||
Specify target file type ("vcd", "svcd", "dvd", "dv", "dv50", "pal-vcd",
|
Specify target file type (@code{vcd}, @code{svcd}, @code{dvd}, @code{dv},
|
||||||
"ntsc-svcd", ... ). All the format options (bitrate, codecs,
|
@code{dv50}). @var{type} may be prefixed with @code{pal-}, @code{ntsc-} or
|
||||||
buffer sizes) are then set automatically. You can just type:
|
@code{film-} to use the corresponding standard. All the format options
|
||||||
|
(bitrate, codecs, buffer sizes) are then set automatically. You can just type:
|
||||||
|
|
||||||
@example
|
@example
|
||||||
ffmpeg -i myfile.avi -target vcd /tmp/vcd.mpg
|
ffmpeg -i myfile.avi -target vcd /tmp/vcd.mpg
|
||||||
@ -780,8 +783,10 @@ Show benchmarking information at the end of an encode.
|
|||||||
Shows CPU time used and maximum memory consumption.
|
Shows CPU time used and maximum memory consumption.
|
||||||
Maximum memory consumption is not supported on all systems,
|
Maximum memory consumption is not supported on all systems,
|
||||||
it will usually display as 0 if not supported.
|
it will usually display as 0 if not supported.
|
||||||
|
@item -timelimit @var{duration} (@emph{global})
|
||||||
|
Exit after ffmpeg has been running for @var{duration} seconds.
|
||||||
@item -dump (@emph{global})
|
@item -dump (@emph{global})
|
||||||
Dump each input packet.
|
Dump each input packet to stderr.
|
||||||
@item -hex (@emph{global})
|
@item -hex (@emph{global})
|
||||||
When dumping packets, also dump the payload.
|
When dumping packets, also dump the payload.
|
||||||
@item -ps @var{size}
|
@item -ps @var{size}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user