ffmpeg | branch: release/2.4 | Luca Barbato <[email protected]> | Wed Oct 15
02:43:30 2014 +0200| [4d48691622149ba5998de08a0acec85d1f4ed46a] | committer:
Vittorio Giovara
cmdutils: Use the correct guard
The OptionDef arrays are terminated with a { NULL } element not NULL.
CC: [email protected]
Bug-Id: CID 703769
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4d48691622149ba5998de08a0acec85d1f4ed46a
---
cmdutils.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/cmdutils.c b/cmdutils.c
index a7b0060..3415c0f 100644
--- a/cmdutils.c
+++ b/cmdutils.c
@@ -414,7 +414,7 @@ int locate_option(int argc, char **argv, const OptionDef
*options,
(po->name && !strcmp(optname, po->name)))
return i;
- if (!po || po->flags & HAS_ARG)
+ if (!po->name || po->flags & HAS_ARG)
i++;
}
return 0;
_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
