Commit 360383bf authored by Yaowu Xu's avatar Yaowu Xu Committed by Gerrit Code Review

Merge "decodeframe.c: aom_read_tree_cdf->aom_read_symbol" into nextgenv2

parents 6d5ebbd7 f2581a3a
...@@ -1441,8 +1441,8 @@ static PARTITION_TYPE read_partition(AV1_COMMON *cm, MACROBLOCKD *xd, ...@@ -1441,8 +1441,8 @@ static PARTITION_TYPE read_partition(AV1_COMMON *cm, MACROBLOCKD *xd,
ACCT_STR); ACCT_STR);
#else #else
#if CONFIG_DAALA_EC #if CONFIG_DAALA_EC
p = (PARTITION_TYPE)aom_read_tree_cdf(r, cm->fc->partition_cdf[ctx], p = (PARTITION_TYPE)aom_read_symbol(r, cm->fc->partition_cdf[ctx],
PARTITION_TYPES, ACCT_STR); PARTITION_TYPES, ACCT_STR);
#else #else
p = (PARTITION_TYPE)aom_read_tree(r, av1_partition_tree, probs, ACCT_STR); p = (PARTITION_TYPE)aom_read_tree(r, av1_partition_tree, probs, ACCT_STR);
#endif #endif
......
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