Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Xiph.Org
aom-rav1e
Commits
e86288d2
Commit
e86288d2
authored
Oct 31, 2016
by
Yaowu Xu
Browse files
Fix a bad merge
Change-Id: I4615e8e64d75b1f4277d2221ec94c5d4f1830aa4
parent
292bd655
Changes
1
Hide whitespace changes
Inline
Side-by-side
av1/decoder/decodeframe.c
View file @
e86288d2
...
...
@@ -242,7 +242,7 @@ static void update_mv_probs(aom_prob *p, int n, aom_reader *r) {
static
void
read_mv_probs
(
nmv_context
*
ctx
,
int
allow_hp
,
aom_reader
*
r
)
{
int
i
;
#if !CONFIG_EC_ADAPT
|| !CONFIG_EC_MULTISYMBOL
#if !CONFIG_EC_ADAPT
int
j
;
update_mv_probs
(
ctx
->
joints
,
MV_JOINTS
-
1
,
r
);
...
...
Write
Preview
Supports
Markdown
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