From: Stefano Sabatini <stefano.sabatini-lala@poste.it>
Date: Sun, 7 Feb 2010 15:46:18 +0000 (+0000)
Subject: Make parse_options() explicitely handle the case where an opt_func2
X-Git-Tag: v0.6~1429
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9e5381a21b2106a012b92c1878886c5af4e1a932;p=platform%2Fupstream%2Flibav.git

Make parse_options() explicitely handle the case where an opt_func2
function returns a negative value, rather than erroneously trigger the
code which manages the case of unknown option.

Originally committed as revision 21670 to svn://svn.ffmpeg.org/ffmpeg/trunk
---

diff --git a/cmdutils.c b/cmdutils.c
index 90dfccf..450ae32 100644
--- a/cmdutils.c
+++ b/cmdutils.c
@@ -170,8 +170,10 @@ unknown_opt:
             } else if (po->flags & OPT_FLOAT) {
                 *po->u.float_arg = parse_number_or_die(opt, arg, OPT_FLOAT, -1.0/0.0, 1.0/0.0);
             } else if (po->flags & OPT_FUNC2) {
-                if(po->u.func2_arg(opt, arg)<0)
-                    goto unknown_opt;
+                if (po->u.func2_arg(opt, arg) < 0) {
+                    fprintf(stderr, "%s: invalid value '%s' for option '%s'\n", argv[0], arg, opt);
+                    exit(1);
+                }
             } else {
                 po->u.func_arg(arg);
             }