commit bdd60a7be779400e597cae001448a44d21c98f2b
author John Koleszar <jkoleszar@google.com> Tue Nov 29 08:54:31 2011 -0800
committer Gerrit Code Review <gerrit@gerrit.golo.chromium.org> Tue Nov 29 08:54:31 2011 -0800
tree 441b55d110949564a531e7bd6a0b82fcc4052b16
parent 06fc0f83b6bfd4c97b2b82d5725036f029152671
parent 16e101ba547fe7698c16d2ff1f896b7cb2069e96

Merge "bugfix: all vpxenc arguments were not parsed under all conditions"

vpxenc.c

diff --git a/vpxenc.c b/vpxenc.c
index e8bd86d..2e14f24 100644
--- a/vpxenc.c
+++ b/vpxenc.c
@@ -1442,7 +1442,8 @@
     show_histogram(hist->bucket, buckets, hist->total, scale);
 }
 
-#define ARG_CTRL_CNT_MAX 10
+#define NELEMENTS(x) (sizeof(x)/sizeof(x[0]))
+#define ARG_CTRL_CNT_MAX NELEMENTS(vp8_arg_ctrl_map)
 
 int main(int argc, const char **argv_)
 {
@@ -1721,14 +1722,26 @@
         {
             if (arg_match(&arg, ctrl_args[i], argi))
             {
+                int j;
                 match = 1;
 
-                if (arg_ctrl_cnt < ARG_CTRL_CNT_MAX)
+                /* Point either to the next free element or the first
+                * instance of this control.
+                */
+                for(j=0; j<arg_ctrl_cnt; j++)
+                    if(arg_ctrls[j][0] == ctrl_args_map[i])
+                        break;
+
+                /* Update/insert */
+                assert(j < ARG_CTRL_CNT_MAX);
+                if (j < ARG_CTRL_CNT_MAX)
                 {
-                    arg_ctrls[arg_ctrl_cnt][0] = ctrl_args_map[i];
-                    arg_ctrls[arg_ctrl_cnt][1] = arg_parse_enum_or_int(&arg);
-                    arg_ctrl_cnt++;
+                    arg_ctrls[j][0] = ctrl_args_map[i];
+                    arg_ctrls[j][1] = arg_parse_enum_or_int(&arg);
+                    if(j == arg_ctrl_cnt)
+                        arg_ctrl_cnt++;
                 }
+
             }
         }