diff options
| author | Deb Mukherjee <debargha@google.com> | 2012-07-27 12:22:55 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2012-07-27 12:22:55 -0700 |
| commit | 96f9473866194101807869ef6b0259849d233c77 (patch) | |
| tree | 970f1c796fab9ac7c9bae3d00ca4a5742b2f6e20 /vp8/encoder/modecosts.c | |
| parent | 16945391c33f841306c02a0d7016a036352964aa (diff) | |
| parent | 9984a155d6bb7b81bbe2260e0f5807208fa103e2 (diff) | |
| download | libvpx-96f9473866194101807869ef6b0259849d233c77.tar libvpx-96f9473866194101807869ef6b0259849d233c77.tar.gz libvpx-96f9473866194101807869ef6b0259849d233c77.tar.bz2 libvpx-96f9473866194101807869ef6b0259849d233c77.zip | |
Merge "Merges several experiments" into experimental
Diffstat (limited to 'vp8/encoder/modecosts.c')
| -rw-r--r-- | vp8/encoder/modecosts.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/vp8/encoder/modecosts.c b/vp8/encoder/modecosts.c index 7a9c19a82..8752eead7 100644 --- a/vp8/encoder/modecosts.c +++ b/vp8/encoder/modecosts.c @@ -32,13 +32,8 @@ void vp8_init_mode_costs(VP8_COMP *c) { vp8_cost_tokens((int *)c->mb.inter_bmode_costs, x->fc.bmode_prob, T); } -#if CONFIG_ADAPTIVE_ENTROPY vp8_cost_tokens((int *)c->mb.inter_bmode_costs, - vp8_sub_mv_ref_prob, vp8_sub_mv_ref_tree); -#else - vp8_cost_tokens(c->mb.inter_bmode_costs, - vp8_sub_mv_ref_prob, vp8_sub_mv_ref_tree); -#endif + x->fc.sub_mv_ref_prob[0], vp8_sub_mv_ref_tree); vp8_cost_tokens(c->mb.mbmode_cost[1], x->fc.ymode_prob, vp8_ymode_tree); vp8_cost_tokens(c->mb.mbmode_cost[0], |