diff options
author | Deb Mukherjee <debargha@google.com> | 2012-10-10 11:20:33 -0700 |
---|---|---|
committer | Deb Mukherjee <debargha@google.com> | 2012-10-10 17:05:54 -0700 |
commit | a7333b0a5b9f9d435bba7b1dce72632ae70c0330 (patch) | |
tree | e3546c793d78bee95a1973133a157a54d8c0b425 /vp8/common/generic | |
parent | 239b6a8f3080866de592dcccedf82e694a3a21f3 (diff) | |
download | libvpx-a7333b0a5b9f9d435bba7b1dce72632ae70c0330.tar libvpx-a7333b0a5b9f9d435bba7b1dce72632ae70c0330.tar.gz libvpx-a7333b0a5b9f9d435bba7b1dce72632ae70c0330.tar.bz2 libvpx-a7333b0a5b9f9d435bba7b1dce72632ae70c0330.zip |
Merge of the TX_16X16 experiment
Change-Id: I22aa803ffff330622cdb77277e7b196a9766f882
Diffstat (limited to 'vp8/common/generic')
-rw-r--r-- | vp8/common/generic/systemdependent.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/vp8/common/generic/systemdependent.c b/vp8/common/generic/systemdependent.c index 3d315dafd..0e5e7da33 100644 --- a/vp8/common/generic/systemdependent.c +++ b/vp8/common/generic/systemdependent.c @@ -33,9 +33,8 @@ void vp8_machine_specific_config(VP8_COMMON *ctx) { rtcd->idct.idct8 = vp8_short_idct8x8_c; rtcd->idct.idct1_scalar_add_8x8 = vp8_dc_only_idct_add_8x8_c; rtcd->idct.ihaar2 = vp8_short_ihaar2x2_c; -#if CONFIG_TX16X16 || CONFIG_HYBRIDTRANSFORM16X16 rtcd->idct.idct16x16 = vp8_short_idct16x16_c; -#endif + rtcd->recon.copy16x16 = vp8_copy_mem16x16_c; rtcd->recon.copy8x8 = vp8_copy_mem8x8_c; rtcd->recon.avg16x16 = vp8_avg_mem16x16_c; rtcd->recon.avg8x8 = vp8_avg_mem8x8_c; |