diff options
| author | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2010-06-09 21:28:53 +0000 |
|---|---|---|
| committer | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2010-06-09 21:28:53 +0000 |
| commit | 25e25617f6fbd9a8f4028fe796199dafae51ae6b (patch) | |
| tree | 058c8ea29a9b4319f484619181cce76c2d5c51b6 | |
| parent | db16e3ca6562121c5c9d87a66b2c646e3ad2cf81 (diff) | |
| download | ffmpeg-25e25617f6fbd9a8f4028fe796199dafae51ae6b.tar.gz | |
Make all the numeric options accept in input an expression which is
evaluated through av_strtod().
Fix roundup issue #551.
Originally committed as revision 23556 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | cmdutils.c | 3 | ||||
| -rw-r--r-- | doc/fftools-common-opts.texi | 8 |
2 files changed, 10 insertions, 1 deletions
diff --git a/cmdutils.c b/cmdutils.c index 2349b7052e..fcdebb2005 100644 --- a/cmdutils.c +++ b/cmdutils.c @@ -36,6 +36,7 @@ #include "libpostproc/postprocess.h" #include "libavutil/avstring.h" #include "libavutil/pixdesc.h" +#include "libavutil/eval.h" #include "libavcodec/opt.h" #include "cmdutils.h" #include "version.h" @@ -58,7 +59,7 @@ double parse_number_or_die(const char *context, const char *numstr, int type, do { char *tail; const char *error; - double d = strtod(numstr, &tail); + double d = av_strtod(numstr, &tail); if (*tail) error= "Expected number for %s but found: %s\n"; else if (d < min || d > max) diff --git a/doc/fftools-common-opts.texi b/doc/fftools-common-opts.texi index 4fc271d3e0..b011e73bd3 100644 --- a/doc/fftools-common-opts.texi +++ b/doc/fftools-common-opts.texi @@ -1,3 +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. + @section Generic options These options are shared amongst the ff* tools. |