Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Xiph.Org
aom-rav1e
Commits
bdd60a7b
Commit
bdd60a7b
authored
Nov 29, 2011
by
John Koleszar
Committed by
Gerrit Code Review
Nov 29, 2011
Browse files
Merge "bugfix: all vpxenc arguments were not parsed under all conditions"
parents
06fc0f83
16e101ba
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
18 additions
and
5 deletions
+18
-5
vpxenc.c
vpxenc.c
+18
-5
No files found.
vpxenc.c
View file @
bdd60a7b
...
...
@@ -1442,7 +1442,8 @@ static void show_rate_histogram(struct rate_hist *hist,
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 @@ int main(int argc, const char **argv_)
{
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
++
;
}
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment