diff options
author | Deb Mukherjee <debargha@google.com> | 2012-10-22 11:55:29 -0700 |
---|---|---|
committer | Deb Mukherjee <debargha@google.com> | 2012-10-22 11:55:29 -0700 |
commit | f10465634bbbdc2cd251d8e12d965b91b6cecb83 (patch) | |
tree | 1b0de6880a09b31b63d5bb33c069eefbb074636a /vp8/common/idct.h | |
parent | 6e5cb12886e464c7f744bb905ebccfde5bf378b9 (diff) | |
download | libvpx-f10465634bbbdc2cd251d8e12d965b91b6cecb83.tar libvpx-f10465634bbbdc2cd251d8e12d965b91b6cecb83.tar.gz libvpx-f10465634bbbdc2cd251d8e12d965b91b6cecb83.tar.bz2 libvpx-f10465634bbbdc2cd251d8e12d965b91b6cecb83.zip |
Merging the hybrid transform experiments
Change-Id: I99f1982b30a630a9a070a8326d83b34a33cba14c
Diffstat (limited to 'vp8/common/idct.h')
-rw-r--r-- | vp8/common/idct.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/vp8/common/idct.h b/vp8/common/idct.h index d096e8182..ae33df668 100644 --- a/vp8/common/idct.h +++ b/vp8/common/idct.h @@ -109,12 +109,9 @@ extern prototype_second_order(vp8_short_inv_walsh4x4_lossless_c); extern prototype_second_order(vp8_short_inv_walsh4x4_1_lossless_c); #endif -#if CONFIG_HYBRIDTRANSFORM8X8 || CONFIG_HYBRIDTRANSFORM || CONFIG_HYBRIDTRANSFORM16X16 #include "vp8/common/blockd.h" void vp8_ihtllm_c(short *input, short *output, int pitch, TX_TYPE tx_type, int tx_dim); -#endif - typedef prototype_idct((*vp8_idct_fn_t)); typedef prototype_idct_scalar_add((*vp8_idct_scalar_add_fn_t)); |