Merge "cleanup experiments in configure" into experimental

configure

diff --git a/configure b/configure
index 5f39413..c9b71c5 100755
--- a/configure
+++ b/configure
@@ -214,11 +214,7 @@
     unistd_h
 "
 EXPERIMENT_LIST="
-    t8x8
     csm
-    qimode
-    uvintra
-    compred
     enhanced_interp
     featureupdates
     high_precision_mv

vp8/encoder/encodeframe.c

diff --git a/vp8/encoder/encodeframe.c b/vp8/encoder/encodeframe.c
index 52d3c86..c8ee52f 100644
--- a/vp8/encoder/encodeframe.c
+++ b/vp8/encoder/encodeframe.c
@@ -854,13 +854,6 @@
             check_segref(xd, *segment_id, LAST_FRAME) +
             check_segref(xd, *segment_id, GOLDEN_FRAME) +
             check_segref(xd, *segment_id, ALTREF_FRAME)) > 1)) {
-// TODO this may not be a good idea as it makes sample size small and means
-// the predictor functions cannot use data about most likely value only most
-// likely unpredicted value.
-// #if CONFIG_COMPRED
-//        // Only update count for incorrectly predicted cases
-//        if ( !ref_pred_flag )
-// #endif
         {
           cpi->count_mb_ref_frame_usage
           [xd->mode_info_context->mbmi.ref_frame]++;

vp8/encoder/onyx_if.c

diff --git a/vp8/encoder/onyx_if.c b/vp8/encoder/onyx_if.c
index 3eb25d2..7a9022a 100644
--- a/vp8/encoder/onyx_if.c
+++ b/vp8/encoder/onyx_if.c
@@ -3013,12 +3013,6 @@
     }
   }
 
-// #if !CONFIG_COMPRED
-  // This function has been deprecated for now but we may want to do
-  // something here at a late date
-  // update_rd_ref_frame_probs(cpi);
-// #endif
-
   // Test code for new segment features
   init_seg_features(cpi);
 

vp8/encoder/rdopt.c

diff --git a/vp8/encoder/rdopt.c b/vp8/encoder/rdopt.c
index 00732fd..2c04b54 100644
--- a/vp8/encoder/rdopt.c
+++ b/vp8/encoder/rdopt.c
@@ -3748,9 +3748,6 @@
   int distortion;
   int intra_error = 0;
   unsigned char *segment_id = &xd->mode_info_context->mbmi.segment_id;
-#if CONFIG_COMPRED
-  unsigned char ref_pred_flag;
-#endif
 
   if (xd->segmentation_enabled)
     x->encode_breakout = cpi->segment_encode_breakout[*segment_id];