diff options
| author | John Koleszar <jkoleszar@google.com> | 2011-07-23 00:05:14 -0400 |
|---|---|---|
| committer | John Koleszar <jkoleszar@google.com> | 2011-07-23 00:05:14 -0400 |
| commit | 664cd5ac91d432bad9f4f375b583a490464288c5 (patch) | |
| tree | 78ec5d758f8473b73c75a1b2eaec8dffce5430a3 /vp8/encoder/generic/csystemdependent.c | |
| parent | 058566797a18e226acd1868a562b16e0903b73db (diff) | |
| parent | 773bcc300d88b47b3b465b7627e794b62b01938f (diff) | |
| download | libvpx-664cd5ac91d432bad9f4f375b583a490464288c5.tar libvpx-664cd5ac91d432bad9f4f375b583a490464288c5.tar.gz libvpx-664cd5ac91d432bad9f4f375b583a490464288c5.tar.bz2 libvpx-664cd5ac91d432bad9f4f375b583a490464288c5.zip | |
Merge remote branch 'internal/upstream' into HEAD
Diffstat (limited to 'vp8/encoder/generic/csystemdependent.c')
| -rw-r--r-- | vp8/encoder/generic/csystemdependent.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/vp8/encoder/generic/csystemdependent.c b/vp8/encoder/generic/csystemdependent.c index 8fe82aea4..e78514e52 100644 --- a/vp8/encoder/generic/csystemdependent.c +++ b/vp8/encoder/generic/csystemdependent.c @@ -47,7 +47,9 @@ void vp8_cmachine_specific_config(VP8_COMP *cpi) cpi->rtcd.variance.sad8x16x4d = vp8_sad8x16x4d_c; cpi->rtcd.variance.sad8x8x4d = vp8_sad8x8x4d_c; cpi->rtcd.variance.sad4x4x4d = vp8_sad4x4x4d_c; - +#if ARCH_X86 || ARCH_X86_64 + cpi->rtcd.variance.copy32xn = vp8_copy32xn_c; +#endif cpi->rtcd.variance.var4x4 = vp8_variance4x4_c; cpi->rtcd.variance.var8x8 = vp8_variance8x8_c; cpi->rtcd.variance.var8x16 = vp8_variance8x16_c; |