diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-06-13 04:25:36 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-06-13 04:39:58 +0200 |
| commit | 058d03631afcaa4eb8f61c80c920a192b27d1ca2 (patch) | |
| tree | 82510152837d93c0d3064facfc2cf5b33f6133fb | |
| parent | 21d5de930360bb29482aabd869074b9fd7b74ce3 (diff) | |
| parent | de859358830cfd1daffb1773f6bb069659027321 (diff) | |
| download | ffmpeg-058d03631afcaa4eb8f61c80c920a192b27d1ca2.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
cmdutils: add missing NULL check in parse_options()
x11grab: remove a memory allocation and the associated memcpy.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | cmdutils.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cmdutils.c b/cmdutils.c index 4f27f50f40..1f7ecc4887 100644 --- a/cmdutils.c +++ b/cmdutils.c @@ -273,7 +273,7 @@ unknown_opt: *po->u.int64_arg = parse_number_or_die(opt, arg, OPT_INT64, INT64_MIN, INT64_MAX); } else if (po->flags & OPT_FLOAT) { *po->u.float_arg = parse_number_or_die(opt, arg, OPT_FLOAT, -INFINITY, INFINITY); - } else { + } else if (po->u.func_arg) { if (po->u.func_arg(opt, arg) < 0) { fprintf(stderr, "%s: failed to set value '%s' for option '%s'\n", argv[0], arg, opt); exit(1); |