Commit 23e4e7b6 authored by Nathan E. Egge's avatar Nathan E. Egge Committed by Nathan Egge

Simplify ifdef's in encoder.

Change-Id: I110f7b6cad1935351f8d379bc8a208363e07ecd0
parent f35f527f
......@@ -4846,18 +4846,14 @@ static uint32_t write_compressed_header(AV1_COMP *cpi, uint8_t *data) {
write_global_motion(cpi, header_bc);
#endif // CONFIG_GLOBAL_MOTION
}
#if CONFIG_EC_MULTISYMBOL
#if !CONFIG_EC_ADAPT
#if CONFIG_EC_MULTISYMBOL && !CONFIG_EC_ADAPT
#if CONFIG_NEW_TOKENSET
av1_coef_head_cdfs(fc);
#endif
av1_coef_pareto_cdfs(fc);
for (i = 0; i < NMV_CONTEXTS; ++i) av1_set_mv_cdfs(&fc->nmvc[i]);
#if CONFIG_EC_MULTISYMBOL
av1_set_mode_cdfs(cm);
#endif
#endif // !CONFIG_EC_ADAPT
#endif
#endif // CONFIG_EC_MULTISYMBOL && !CONFIG_EC_ADAPT
#if CONFIG_ANS
aom_buf_ans_flush(header_bc);
header_size = buf_ans_write_end(header_bc);
......
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