shithub: libvpx

Info  •  Files  •  Log  •  Branches

Removed macros for merged experiments

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

Change-Id: I894e8b509a2bb88557f9aba6f226ed7807745065

--- a/vp8/common/entropymv.h

+++ b/vp8/common/entropymv.h

@@ -79,9 +79,7 @@

 #endif

 void vp8_entropy_mv_init();

-#if CONFIG_ADAPTIVE_ENTROPY

 struct VP8Common;

 void vp8_adapt_mv_probs(struct VP8Common *cm);

-#endif

 #endif

--- a/vp8/common/pred_common.c

+++ b/vp8/common/pred_common.c

@@ -170,11 +170,9 @@

       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:

-- 

⑨