[libav-stable] cmdutils: Use the correct guard

Luca Barbato git at libav.org
Fri Oct 17 11:04:12 CEST 2014


Module: libav
Branch: master
Commit: 47e3e1097e09da7f973908e09df15e3bb7c5e1f4

Author:    Luca Barbato <lu_zero at gentoo.org>
Committer: Vittorio Giovara <vittorio.giovara at gmail.com>
Date:      Wed Oct 15 02:43:30 2014 +0200

cmdutils: Use the correct guard

The OptionDef arrays are terminated with a { NULL } element not NULL.

CC: libav-stable at libav.org
Bug-Id: CID 703769

---

 cmdutils.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmdutils.c b/cmdutils.c
index 96b40f3..eff011c 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;



More information about the libav-stable mailing list