RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-01-25 00:33:26 +00:00
Code Issues Projects Releases Wiki Activity

Merge commit '4d48691622149ba5998de08a0acec85d1f4ed46a' into release/2.4

Browse Source 
* commit '4d48691622149ba5998de08a0acec85d1f4ed46a':
  cmdutils: Use the correct guard

Conflicts:
	cmdutils.c

See: 35daf3ca81
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-01-18 00:38:31 +01:00
commit ee025a0c61
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmdutils.c
View File

@ -444,7 +444,7 @@ int locate_option(int argc, char **argv, const OptionDef *options,
(po->name && !strcmp(optname, po->name))) (po->name && !strcmp(optname, po->name)))
return i; return i;
if (po->flags & HAS_ARG) if (!po->name || po->flags & HAS_ARG)
i++; i++;
} }
return 0; return 0;