generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make all the numeric options accept in input an expression which is

Browse Source 
evaluated through av_strtod().

Fix roundup issue #551.

Originally committed as revision 23556 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Stefano Sabatini 2010-06-09 21:28:53 +00:00
parent db16e3ca65
commit 25e25617f6
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmdutils.c
View File

@ -36,6 +36,7 @@
#include "libpostproc/postprocess.h" #include "libpostproc/postprocess.h"
#include "libavutil/avstring.h" #include "libavutil/avstring.h"
#include "libavutil/pixdesc.h" #include "libavutil/pixdesc.h"
#include "libavutil/eval.h"
#include "libavcodec/opt.h" #include "libavcodec/opt.h"
#include "cmdutils.h" #include "cmdutils.h"
#include "version.h" #include "version.h"
@ -58,7 +59,7 @@ double parse_number_or_die(const char *context, const char *numstr, int type, do
{ {
char *tail; char *tail;
const char *error; const char *error;
double d = strtod(numstr, &tail); double d = av_strtod(numstr, &tail);
if (*tail) if (*tail)
error= "Expected number for %s but found: %s\n"; error= "Expected number for %s but found: %s\n";
else if (d < min || d > max) else if (d < min || d > max)

8
doc/fftools-common-opts.texi
View File

@ -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 @section Generic options
These options are shared amongst the ff* tools. These options are shared amongst the ff* tools.