diff options
| author | Ronald S. Bultje <rbultje@google.com> | 2012-10-12 11:06:55 -0700 |
|---|---|---|
| committer | Ronald S. Bultje <rbultje@google.com> | 2012-10-12 11:06:55 -0700 |
| commit | 0dac2901061557fbeaef0cd759b10d41da25998b (patch) | |
| tree | a786590f6022789f02198b59db9222b23bcff71e | |
| parent | 31214970411d48dd3349e7e200d28097d1215555 (diff) | |
| download | libvpx-0dac2901061557fbeaef0cd759b10d41da25998b.tar libvpx-0dac2901061557fbeaef0cd759b10d41da25998b.tar.gz libvpx-0dac2901061557fbeaef0cd759b10d41da25998b.tar.bz2 libvpx-0dac2901061557fbeaef0cd759b10d41da25998b.zip | |
Remove CONFIG_TX16X16, since the experiment was merged.
Change-Id: Ib74824c824f7ebb279e7df8eb32440d4d65fbd79
| -rw-r--r-- | vp8/encoder/rdopt.c | 2 |
1 files changed, 0 insertions, 2 deletions
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); |