RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Make parse_options() explicitely handle the case where an opt_func2 

function returns a negative value, rather than erroneously trigger the
code which manages the case of unknown option.

Originally committed as revision 21670 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Stefano Sabatini 2010-02-07 15:46:18 +00:00
parent 668fd14287
commit 9e5381a21b
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmdutils.c
View File

@ -170,8 +170,10 @@ unknown_opt:
} else if (po->flags & OPT_FLOAT) {
*po->u.float_arg = parse_number_or_die(opt, arg, OPT_FLOAT, -1.0/0.0, 1.0/0.0);
} else if (po->flags & OPT_FUNC2) {
if(po->u.func2_arg(opt, arg)<0)
goto unknown_opt;
if (po->u.func2_arg(opt, arg) < 0) {
fprintf(stderr, "%s: invalid value '%s' for option '%s'\n", argv[0], arg, opt);
exit(1);
}
} else {
po->u.func_arg(arg);
}