1 files changed, 0 insertions, 20 deletions

diff --git a/vp8/decoder/decodframe.c b/vp8/decoder/decodframe.c
index d961c7b2a..8e1ebe35d 100644
--- a/vp8/decoder/decodframe.c
+++ b/vp8/decoder/decodframe.c
@@ -1190,17 +1190,11 @@ int vp8_decode_frame(VP8D_COMP *pbi) {
 #endif
 
   /* Read the loop filter level and type */
-#if CONFIG_TX_SELECT
   pc->txfm_mode = vp8_read_literal(&header_bc, 2);
   if (pc->txfm_mode == TX_MODE_SELECT) {
     pc->prob_tx[0] = vp8_read_literal(&header_bc, 8);
     pc->prob_tx[1] = vp8_read_literal(&header_bc, 8);
   }
-#else
-  pc->txfm_mode = (TXFM_MODE) vp8_read_bit(&header_bc);
-  if (pc->txfm_mode == ALLOW_8X8)
-    pc->txfm_mode = ALLOW_16X16;
-#endif
 
   pc->filter_type = (LOOPFILTERTYPE) vp8_read_bit(&header_bc);
   pc->filter_level = vp8_read_literal(&header_bc, 6);
@@ -1354,12 +1348,7 @@ int vp8_decode_frame(VP8D_COMP *pbi) {
   vp8_copy(pbi->common.fc.pre_i8x8_mode_prob, pbi->common.fc.i8x8_mode_prob);
   vp8_copy(pbi->common.fc.pre_sub_mv_ref_prob, pbi->common.fc.sub_mv_ref_prob);
   vp8_copy(pbi->common.fc.pre_mbsplit_prob, pbi->common.fc.mbsplit_prob);
-#if CONFIG_NEWMVENTROPY
   pbi->common.fc.pre_nmvc = pbi->common.fc.nmvc;
-#else
-  vp8_copy(pbi->common.fc.pre_mvc, pbi->common.fc.mvc);
-  vp8_copy(pbi->common.fc.pre_mvc_hp, pbi->common.fc.mvc_hp);
-#endif
   vp8_zero(pbi->common.fc.coef_counts);
   vp8_zero(pbi->common.fc.hybrid_coef_counts);
   vp8_zero(pbi->common.fc.coef_counts_8x8);
@@ -1372,12 +1361,7 @@ int vp8_decode_frame(VP8D_COMP *pbi) {
   vp8_zero(pbi->common.fc.i8x8_mode_counts);
   vp8_zero(pbi->common.fc.sub_mv_ref_counts);
   vp8_zero(pbi->common.fc.mbsplit_counts);
-#if CONFIG_NEWMVENTROPY
   vp8_zero(pbi->common.fc.NMVcount);
-#else
-  vp8_zero(pbi->common.fc.MVcount);
-  vp8_zero(pbi->common.fc.MVcount_hp);
-#endif
   vp8_zero(pbi->common.fc.mv_ref_ct);
   vp8_zero(pbi->common.fc.mv_ref_ct_a);
 
@@ -1436,11 +1420,7 @@ int vp8_decode_frame(VP8D_COMP *pbi) {
   vp8_adapt_coef_probs(pc);
   if (pc->frame_type != KEY_FRAME) {
     vp8_adapt_mode_probs(pc);
-#if CONFIG_NEWMVENTROPY
     vp8_adapt_nmv_probs(pc, xd->allow_high_precision_mv);
-#else
-    vp8_adapt_mv_probs(pc);
-#endif
     vp8_update_mode_context(&pbi->common);
   }