Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
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
a7c81466
Commit
a7c81466
authored
Sep 26, 2016
by
Peter de Rivaz
Browse files
Fix for compile error with RECT_TX without EXT_TX
Change-Id: I2f4e3fc877c03a5bee7f7fd1dc50e6a693697647
parent
71427df5
Changes
1
Hide whitespace changes
Inline
Side-by-side
av1/decoder/decodemv.c
View file @
a7c81466
...
...
@@ -306,14 +306,14 @@ static TX_SIZE read_tx_size_inter(AV1_COMMON *cm, MACROBLOCKD *xd,
if
(
allow_select
&&
tx_mode
==
TX_MODE_SELECT
)
{
const
TX_SIZE
coded_tx_size
=
read_selected_tx_size
(
cm
,
xd
,
inter_tx_size_cat_lookup
[
bsize
],
r
);
#if !CONFIG_RECT_TX
assert
(
coded_tx_size
<=
max_txsize_lookup
[
bsize
]);
#else
#if CONFIG_EXT_TX && CONFIG_RECT_TX
if
(
coded_tx_size
>
max_txsize_lookup
[
bsize
])
{
assert
(
coded_tx_size
==
max_txsize_lookup
[
bsize
]
+
1
);
return
max_txsize_rect_lookup
[
bsize
];
}
#endif // !CONFIG_RECT_TX
#else
assert
(
coded_tx_size
<=
max_txsize_lookup
[
bsize
]);
#endif // CONFIG_EXT_TX && CONFIG_RECT_TX
return
coded_tx_size
;
}
else
{
return
tx_size_from_tx_mode
(
bsize
,
cm
->
tx_mode
,
1
);
...
...
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