generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "Fix ec_adapt+daala_ec test failure" into nextgenv2

Browse Source
This commit is contained in:
Yaowu Xu
2016-10-30 16:22:05 +00:00
committed by Gerrit Code Review
parent eaafb17d41 bc0a5bacb5
commit cfab447bf8
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
av1/encoder/segmentation.c
View File

@@ -374,7 +374,7 @@ void av1_choose_segmap_coding_method(AV1_COMMON *cm, MACROBLOCKD *xd) {
} else { } else {
seg->temporal_update = 0; seg->temporal_update = 0;
} }
#if CONFIG_DAALA_EC #if !CONFIG_EC_ADAPT && CONFIG_DAALA_EC
av1_tree_to_cdf(av1_segment_tree, segp->tree_probs, segp->tree_cdf); av1_tree_to_cdf(av1_segment_tree, segp->tree_probs, segp->tree_cdf);
#endif #endif
} }