apps/ffmpeg-rockchip
1
0
Fork 0
mirror of https://github.com/nyanmisaka/ffmpeg-rockchip.git synced 2025-10-26 10:20:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

fftools: handle errors in parse_options()

Browse Source
This commit is contained in:
Anton Khirnov
2023-07-14 16:43:51 +02:00
parent 49ac7fc485
commit 39d5104332
4 changed files with 27 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
fftools/cmdutils.c
View File

@@ -364,8 +364,8 @@ int parse_option(void *optctx, const char *opt, const char *arg,
return !!(po->flags & HAS_ARG);
}
void parse_options(void *optctx, int argc, char **argv, const OptionDef *options,
void (*parse_arg_function)(void *, const char*))
int parse_options(void *optctx, int argc, char **argv, const OptionDef *options,
int (*parse_arg_function)(void *, const char*))
{
const char *opt;
int optindex, handleoptions = 1, ret;
@@ -386,13 +386,18 @@ void parse_options(void *optctx, int argc, char **argv, const OptionDef *options
opt++;
if ((ret = parse_option(optctx, opt, argv[optindex], options)) < 0)
exit_program(1);
return ret;
optindex += ret;
} else {
if (parse_arg_function)
parse_arg_function(optctx, opt);
if (parse_arg_function) {
ret = parse_arg_function(optctx, opt);
if (ret < 0)
return ret;
}
}
}
return 0;
}
int parse_optgroup(void *optctx, OptionGroup *g)