diff options
| author | Ronald S. Bultje <rbultje@google.com> | 2012-02-09 16:11:00 -0800 |
|---|---|---|
| committer | Ronald S. Bultje <rbultje@google.com> | 2012-02-09 16:29:18 -0800 |
| commit | 29e4d7e861eb044902a34291df0814e972e28bcb (patch) | |
| tree | 37b53377a9f1006294bf0a9d2e31ebcfcfdf6393 /vp8/common/generic | |
| parent | d90f0eb4c559595262f2cebc39adbfbbdf855efb (diff) | |
| download | libvpx-29e4d7e861eb044902a34291df0814e972e28bcb.tar libvpx-29e4d7e861eb044902a34291df0814e972e28bcb.tar.gz libvpx-29e4d7e861eb044902a34291df0814e972e28bcb.tar.bz2 libvpx-29e4d7e861eb044902a34291df0814e972e28bcb.zip | |
Merge dualpred (compound prediction) experiment.
Change-Id: Ieaaa07c50eae41118596197f6a4d848135946e41
Diffstat (limited to 'vp8/common/generic')
| -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 267b2f21a..22d249b89 100644 --- a/vp8/common/generic/systemdependent.c +++ b/vp8/common/generic/systemdependent.c @@ -84,10 +84,8 @@ void vp8_machine_specific_config(VP8_COMMON *ctx) #endif rtcd->recon.copy16x16 = vp8_copy_mem16x16_c; rtcd->recon.copy8x8 = vp8_copy_mem8x8_c; -#if CONFIG_DUALPRED rtcd->recon.avg16x16 = vp8_avg_mem16x16_c; rtcd->recon.avg8x8 = vp8_avg_mem8x8_c; -#endif /* CONFIG_DUALPRED */ rtcd->recon.copy8x4 = vp8_copy_mem8x4_c; rtcd->recon.recon = vp8_recon_b_c; rtcd->recon.recon_uv = vp8_recon_uv_b_c; @@ -112,18 +110,14 @@ void vp8_machine_specific_config(VP8_COMMON *ctx) rtcd->subpix.sixtap16x16 = vp8_sixtap_predict16x16_c; rtcd->subpix.sixtap8x8 = vp8_sixtap_predict8x8_c; -#if CONFIG_DUALPRED rtcd->subpix.sixtap_avg16x16 = vp8_sixtap_predict_avg16x16_c; rtcd->subpix.sixtap_avg8x8 = vp8_sixtap_predict_avg8x8_c; -#endif /* CONFIG_DUALPRED */ rtcd->subpix.sixtap8x4 = vp8_sixtap_predict8x4_c; rtcd->subpix.sixtap4x4 = vp8_sixtap_predict_c; rtcd->subpix.bilinear16x16 = vp8_bilinear_predict16x16_c; rtcd->subpix.bilinear8x8 = vp8_bilinear_predict8x8_c; -#if CONFIG_DUALPRED rtcd->subpix.bilinear_avg16x16 = vp8_bilinear_predict_avg16x16_c; rtcd->subpix.bilinear_avg8x8 = vp8_bilinear_predict_avg8x8_c; -#endif /* CONFIG_DUALPRED */ rtcd->subpix.bilinear8x4 = vp8_bilinear_predict8x4_c; rtcd->subpix.bilinear4x4 = vp8_bilinear_predict4x4_c; |