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
12231bd6
Commit
12231bd6
authored
Sep 07, 2017
by
Hui Su
Browse files
Fix build when motion-var is disabled
Change-Id: Ie3912cb012676ccd26d2c0601e21fbb54943b1a0
parent
2357382a
Changes
1
Hide whitespace changes
Inline
Side-by-side
av1/common/blockd.h
View file @
12231bd6
...
...
@@ -1573,18 +1573,15 @@ static INLINE MOTION_MODE motion_mode_allowed(
if
(
!
has_second_ref
(
mbmi
)
&&
mbmi
->
num_proj_ref
[
0
]
>=
1
&&
!
av1_is_scaled
(
&
(
xd
->
block_refs
[
0
]
->
sf
)))
{
return
WARPED_CAUSAL
;
}
else
{
}
#endif // CONFIG_WARPED_MOTION
#if CONFIG_MOTION_VAR
#if CONFIG_NCOBMC_ADAPT_WEIGHT
if
(
ncobmc_mode_allowed_bsize
(
mbmi
->
sb_type
)
<
NO_OVERLAP
)
return
NCOBMC_ADAPT_WEIGHT
;
else
if
(
ncobmc_mode_allowed_bsize
(
mbmi
->
sb_type
)
<
NO_OVERLAP
)
return
NCOBMC_ADAPT_WEIGHT
;
else
#endif
return
OBMC_CAUSAL
;
#if CONFIG_WARPED_MOTION
}
#endif // CONFIG_WARPED_MOTION
return
OBMC_CAUSAL
;
#else
return
SIMPLE_TRANSLATION
;
#endif // CONFIG_MOTION_VAR
...
...
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