Removed macros for merged experiments

Removed two macros corresponding to experiments that were
merged into the main code.

Change-Id: I894e8b509a2bb88557f9aba6f226ed7807745065

diff --git a/vp8/common/entropymv.h b/vp8/common/entropymv.h
index c0726ec..9141c2b 100644 (file)
--- 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 b7d52a5..ac5d860 100644 (file)
--- 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: