diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-11-26 00:43:45 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-11-26 00:43:45 +0100 |
| commit | bf2f93cdbf15c96c62b5112c1ab7f8093177e508 (patch) | |
| tree | 02992eb3142695332689898d713bef0653f3aa32 /doc/avtools-common-opts.texi | |
| parent | b473c9937ebe9aafef9d2e07f080fb12ecc53ef4 (diff) | |
| parent | 28c8e288fa0342fdef532a7522a4707bebf831cc (diff) | |
| download | ffmpeg-bf2f93cdbf15c96c62b5112c1ab7f8093177e508.tar.gz | |
Merge commit '28c8e288fa0342fdef532a7522a4707bebf831cc'
* commit '28c8e288fa0342fdef532a7522a4707bebf831cc':
x86: h264_chromamc: port to cpuflags
yop: fix typo
avconv: fix copying per-stream metadata.
doc: avtools-common-opts: Fix terminology concerning metric prefixes
configure: suncc: Add compiler arch support for Nehalem & Sandy Bridge
riff: Make ff_riff_tags static and move under appropriate #ifdef
Conflicts:
libavformat/riff.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/avtools-common-opts.texi')
| -rw-r--r-- | doc/avtools-common-opts.texi | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/doc/avtools-common-opts.texi b/doc/avtools-common-opts.texi index d43ff6e015..bce5220274 100644 --- a/doc/avtools-common-opts.texi +++ b/doc/avtools-common-opts.texi @@ -1,10 +1,11 @@ All the numerical options, if not specified otherwise, accept in input a string representing a number, which may contain one of the -International System number postfixes, for example 'K', 'M', 'G'. -If 'i' is appended after the postfix, powers of 2 are used instead of -powers of 10. The 'B' postfix multiplies the value for 8, and can be -appended after another postfix or used alone. This allows using for -example 'KB', 'MiB', 'G' and 'B' as postfix. +SI unit prefixes, for example 'K', 'M', 'G'. +If 'i' is appended after the prefix, binary prefixes are used, +which are based on powers of 1024 instead of powers of 1000. +The 'B' postfix multiplies the value by 8, and can be +appended after a unit prefix or used alone. This allows using for +example 'KB', 'MiB', 'G' and 'B' as number postfix. Options which do not take arguments are boolean options, and set the corresponding value to true. They can be set to false by prefixing |