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

diff --git a/cmdutils.c b/cmdutils.c
index 2349b70..fcdebb2 100644 (file)
--- 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 4fc271d..b011e73 100644 (file)
--- 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.