[SCM] libav/experimental: Make parse_options() use parse_number_or_die(). Patch by Stefano Sabatini stefano sabatini-lala poste it
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 16:15:37 UTC 2013
The following commit has been merged in the experimental branch:
commit 7c84b8bcdd682712a7a6b65a9e10fea8bf981b3b
Author: Stefano Sabatini <stefano.sabatini-lala at poste.it>
Date: Mon Feb 25 14:15:52 2008 +0000
Make parse_options() use parse_number_or_die().
Patch by Stefano Sabatini stefano sabatini-lala poste it
Originally committed as revision 12211 to svn://svn.ffmpeg.org/ffmpeg/trunk
diff --git a/cmdutils.c b/cmdutils.c
index c01a6df..0719063 100644
--- a/cmdutils.c
+++ b/cmdutils.c
@@ -22,6 +22,7 @@
#include <string.h>
#include <stdlib.h>
#include <errno.h>
+#include <math.h>
#include "avformat.h"
#include "avdevice.h"
@@ -122,11 +123,11 @@ unknown_opt:
} else if (po->flags & OPT_BOOL) {
*po->u.int_arg = 1;
} else if (po->flags & OPT_INT) {
- *po->u.int_arg = atoi(arg);
+ *po->u.int_arg = parse_number_or_die(opt+1, arg, OPT_INT64, INT_MIN, INT_MAX);
} else if (po->flags & OPT_INT64) {
- *po->u.int64_arg = strtoll(arg, (char **)NULL, 10);
+ *po->u.int64_arg = parse_number_or_die(opt+1, arg, OPT_INT64, INT64_MIN, INT64_MAX);
} else if (po->flags & OPT_FLOAT) {
- *po->u.float_arg = atof(arg);
+ *po->u.float_arg = parse_number_or_die(opt+1, arg, OPT_FLOAT, -INFINITY, INFINITY);
} else if (po->flags & OPT_FUNC2) {
if(po->u.func2_arg(opt+1, arg)<0)
goto unknown_opt;
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list