diff options
author | Yaowu Xu <yaowu@google.com> | 2011-12-07 13:03:57 -0800 |
---|---|---|
committer | Yaowu Xu <yaowu@google.com> | 2011-12-07 13:48:53 -0800 |
commit | d37cd9768258aa976bfd0df69a5ae9dded04a30c (patch) | |
tree | 3d035334d7372da6e0bb40904ea43c590c6dafa1 /vp8/common/generic/systemdependent.c | |
parent | 76feb965d3340cfe38a06ee017ff02e4a493cecf (diff) | |
download | libvpx-d37cd9768258aa976bfd0df69a5ae9dded04a30c.tar libvpx-d37cd9768258aa976bfd0df69a5ae9dded04a30c.tar.gz libvpx-d37cd9768258aa976bfd0df69a5ae9dded04a30c.tar.bz2 libvpx-d37cd9768258aa976bfd0df69a5ae9dded04a30c.zip |
Removed #if CONFIG_I8X8
This commit removed the macro CONFIG_I8X8, which was used to indicate
the 8x8 intra prediction experiment, made the change fully merged in.
Change-Id: Iafa4443781ce6e83f5591c12ba615a0e92ce0ea0
Diffstat (limited to 'vp8/common/generic/systemdependent.c')
-rw-r--r-- | vp8/common/generic/systemdependent.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/vp8/common/generic/systemdependent.c b/vp8/common/generic/systemdependent.c index 961916314..445cd3f09 100644 --- a/vp8/common/generic/systemdependent.c +++ b/vp8/common/generic/systemdependent.c @@ -90,9 +90,7 @@ void vp8_machine_specific_config(VP8_COMMON *ctx) #endif /* CONFIG_DUALPRED */ rtcd->recon.copy8x4 = vp8_copy_mem8x4_c; rtcd->recon.recon = vp8_recon_b_c; -#if CONFIG_I8X8 rtcd->recon.recon_uv = vp8_recon_uv_b_c; -#endif rtcd->recon.recon2 = vp8_recon2b_c; rtcd->recon.recon4 = vp8_recon4b_c; rtcd->recon.recon_mb = vp8_recon_mb_c; @@ -107,14 +105,10 @@ void vp8_machine_specific_config(VP8_COMMON *ctx) vp8_build_intra_predictors_mbuv_s; rtcd->recon.intra4x4_predict = vp8_intra4x4_predict; - -#if CONFIG_I8X8 rtcd->recon.intra8x8_predict = vp8_intra8x8_predict; rtcd->recon.intra_uv4x4_predict = vp8_intra_uv4x4_predict; -#endif - rtcd->subpix.sixtap16x16 = vp8_sixtap_predict16x16_c; rtcd->subpix.sixtap8x8 = vp8_sixtap_predict8x8_c; |