[libav-commits] cmdutils: fix options starting with 'no'.

Alexandra Khirnova git at libav.org
Fri Jan 27 10:47:45 CET 2012


Module: libav
Branch: master
Commit: 570f6aaab12e2bcf6605e9e3a5e1204b3cfccfc1

Author:    Alexandra Khirnova <alexandra at khirnov.net>
Committer: Anton Khirnov <anton at khirnov.net>
Date:      Fri Jan 27 08:59:00 2012 +0000

cmdutils: fix options starting with 'no'.

E.g. non_linear_quant mpeg2video private option.

Signed-off-by: Anton Khirnov <anton at khirnov.net>

---

 cmdutils.c |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/cmdutils.c b/cmdutils.c
index 0a87dee..e8f1732 100644
--- a/cmdutils.c
+++ b/cmdutils.c
@@ -233,14 +233,12 @@ int parse_option(void *optctx, const char *opt, const char *arg,
     if (!po->name && opt[0] == 'n' && opt[1] == 'o') {
         /* handle 'no' bool option */
         po = find_option(options, opt + 2);
-        if (!(po->name && (po->flags & OPT_BOOL)))
-            goto unknown_opt;
-        bool_val = 0;
+        if ((po->name && (po->flags & OPT_BOOL)))
+            bool_val = 0;
     }
     if (!po->name)
         po = find_option(options, "default");
     if (!po->name) {
-unknown_opt:
         av_log(NULL, AV_LOG_ERROR, "Unrecognized option '%s'\n", opt);
         return AVERROR(EINVAL);
     }



More information about the libav-commits mailing list