diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-01-18 00:38:31 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-01-18 00:38:44 +0100 |
| commit | ee025a0c6137a07f2a2cd4cb5bd09b90076d1772 (patch) | |
| tree | 1a908414ae7bb276fe4d8e28f264f556a6aab9e9 | |
| parent | 679c3d210f5d40dd19bb8dee9cf8353e99d8c9b0 (diff) | |
| parent | 4d48691622149ba5998de08a0acec85d1f4ed46a (diff) | |
| download | ffmpeg-ee025a0c6137a07f2a2cd4cb5bd09b90076d1772.tar.gz | |
Merge commit '4d48691622149ba5998de08a0acec85d1f4ed46a' into release/2.4
* commit '4d48691622149ba5998de08a0acec85d1f4ed46a':
cmdutils: Use the correct guard
Conflicts:
cmdutils.c
See: 35daf3ca8173f80f200860e06a410ced31a8b360
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | cmdutils.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cmdutils.c b/cmdutils.c index 578d03ad91..612810a374 100644 --- a/cmdutils.c +++ b/cmdutils.c @@ -444,7 +444,7 @@ int locate_option(int argc, char **argv, const OptionDef *options, (po->name && !strcmp(optname, po->name))) return i; - if (po->flags & HAS_ARG) + if (!po->name || po->flags & HAS_ARG) i++; } return 0; |