Commit ccc809f3 authored by Jingning Han's avatar Jingning Han Committed by Gerrit Code Review
Browse files

Merge "Fix an assertion condition in transform type search" into nextgenv2

parents 431e3591 02734b64
......@@ -1423,8 +1423,12 @@ static void choose_tx_size_from_rd(VP10_COMP *cpi, MACROBLOCK *x,
mbmi->tx_size = best_tx;
mbmi->tx_type = best_tx_type;
#if !CONFIG_EXT_TX
if (mbmi->tx_size >= TX_32X32)
assert(mbmi->tx_type == DCT_DCT);
#endif
txfm_rd_in_plane(x,
cpi,
&r, &d, &s,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment