opensource/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-05-23 18:06:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

cmdutils: remove OPT_FUNC2

Browse Source 
Make ff* tools only accept opt_* functions taking two arguments.

The distinction between functions with one and two arguments is quite
pointless. Simplify parse_options() code.
This commit is contained in:
Stefano Sabatini
2011-05-24 18:14:42 +02:00
parent 78046dadc3
commit eb8bc57240
6 changed files with 148 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
cmdutils.c
View File

@ -273,15 +273,13 @@ 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 if (po->flags & OPT_FUNC2) {
if (po->u.func2_arg(opt, arg) < 0) {
fprintf(stderr, "%s: failed to set value '%s' for option '%s'\n", argv[0], arg, opt);
exit(1);
}
} else if (po->flags & OPT_DUMMY) {
/* Do nothing for this option */
} else {
po->u.func_arg(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);
}
}
if(po->flags & OPT_EXIT)
exit(0);