diff options
| author | Adrian Grange <agrange@google.com> | 2012-07-31 12:07:26 -0700 |
|---|---|---|
| committer | Adrian Grange <agrange@google.com> | 2012-07-31 12:07:26 -0700 |
| commit | 171b4ae1575ccfcf02dcaebd49a099c3a23fa0eb (patch) | |
| tree | 2572b2096660d4d36e7f0d3011407bc0332db5ef /vp8/common | |
| parent | 5259744145fe4ff41d3c814514c0744444969ad3 (diff) | |
| download | libvpx-171b4ae1575ccfcf02dcaebd49a099c3a23fa0eb.tar libvpx-171b4ae1575ccfcf02dcaebd49a099c3a23fa0eb.tar.gz libvpx-171b4ae1575ccfcf02dcaebd49a099c3a23fa0eb.tar.bz2 libvpx-171b4ae1575ccfcf02dcaebd49a099c3a23fa0eb.zip | |
Removed macros for merged experiments
Removed two macros corresponding to experiments that were
merged into the main code.
Change-Id: I894e8b509a2bb88557f9aba6f226ed7807745065
Diffstat (limited to 'vp8/common')
| -rw-r--r-- | vp8/common/entropymv.h | 2 | ||||
| -rw-r--r-- | vp8/common/pred_common.c | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/vp8/common/entropymv.h b/vp8/common/entropymv.h index c0726ecea..9141c2bce 100644 --- a/vp8/common/entropymv.h +++ b/vp8/common/entropymv.h @@ -79,9 +79,7 @@ extern struct vp8_token_struct vp8_small_mvencodings_hp [16]; #endif void vp8_entropy_mv_init(); -#if CONFIG_ADAPTIVE_ENTROPY struct VP8Common; void vp8_adapt_mv_probs(struct VP8Common *cm); -#endif #endif diff --git a/vp8/common/pred_common.c b/vp8/common/pred_common.c index b7d52a54f..ac5d86009 100644 --- a/vp8/common/pred_common.c +++ b/vp8/common/pred_common.c @@ -170,11 +170,9 @@ vp8_prob *get_pred_probs(VP8_COMMON *const cm, pred_probability = &cm->prob_comppred[pred_context]; break; -#if CONFIG_NEWENTROPY case PRED_MBSKIP: pred_probability = &cm->mbskip_pred_probs[pred_context]; break; -#endif #if CONFIG_SWITCHABLE_INTERP case PRED_SWITCHABLE_INTERP: |