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

cmdline: fix -- to escape files starting with - 

Fixes Ticket2127

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-01-17 17:03:07 +01:00
parent 61625565e4
commit 9381521968
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cmdutils.c
View File

@ -656,6 +656,7 @@ int split_commandline(OptionParseContext *octx, int argc, char *argv[],
const OptionGroupDef *groups, int nb_groups) const OptionGroupDef *groups, int nb_groups)
{ {
int optindex = 1; int optindex = 1;
int dashdash = -2;
/* perform system-dependent conversions for arguments list */ /* perform system-dependent conversions for arguments list */
prepare_app_arguments(&argc, &argv); prepare_app_arguments(&argc, &argv);
@ -670,8 +671,12 @@ int split_commandline(OptionParseContext *octx, int argc, char *argv[],
av_log(NULL, AV_LOG_DEBUG, "Reading option '%s' ...", opt); av_log(NULL, AV_LOG_DEBUG, "Reading option '%s' ...", opt);
if (opt[0] == '-' && opt[1] == '-' && !opt[2]) {
dashdash = optindex;
continue;
}
/* unnamed group separators, e.g. output filename */ /* unnamed group separators, e.g. output filename */
if (opt[0] != '-' || !opt[1]) { if (opt[0] != '-' || !opt[1] || dashdash+1 == optindex) {
finish_group(octx, 0, opt); finish_group(octx, 0, opt);
av_log(NULL, AV_LOG_DEBUG, " matched as %s.\n", groups[0].name); av_log(NULL, AV_LOG_DEBUG, " matched as %s.\n", groups[0].name);
continue; continue;