From: Ronald S. Bultje <rbultje@google.com>
Date: Fri, 12 Oct 2012 18:06:55 +0000 (-0700)
Subject: Remove CONFIG_TX16X16, since the experiment was merged.
X-Git-Tag: v1.3.0~1217^2~249
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0dac2901061557fbeaef0cd759b10d41da25998b;p=libvpx

Remove CONFIG_TX16X16, since the experiment was merged.

Change-Id: Ib74824c824f7ebb279e7df8eb32440d4d65fbd79
---

diff --git a/vp8/encoder/rdopt.c b/vp8/encoder/rdopt.c
index 64824f01f..467cb313d 100644
--- a/vp8/encoder/rdopt.c
+++ b/vp8/encoder/rdopt.c
@@ -3638,9 +3638,7 @@ void vp8_rd_pick_inter_mode(VP8_COMP *cpi, MACROBLOCK *x, int recon_yoffset, int
                                                  &d8x8, best_yrd);
           txfm_cache[ONLY_4X4]  = tmp_rd_4x4;
           txfm_cache[ALLOW_8X8] = tmp_rd_8x8;
-#if CONFIG_TX16X16
           txfm_cache[ALLOW_16X16] = tmp_rd_8x8;
-#endif
 #if CONFIG_TX_SELECT
           tmp_rd_4x4s = tmp_rd_4x4 + RDCOST(x->rdmult, x->rddiv, cost0, 0);
           tmp_rd_8x8s = tmp_rd_8x8 + RDCOST(x->rdmult, x->rddiv, cost1, 0);