diff options
| author | John Koleszar <jkoleszar@google.com> | 2011-01-19 00:05:16 -0500 |
|---|---|---|
| committer | John Koleszar <jkoleszar@google.com> | 2011-01-19 00:05:18 -0500 |
| commit | ae4db164e5ece4ffdf8d2f460940244763e5052d (patch) | |
| tree | a0f227279d6b4726afb550ee740385a64820a85d /vp8/encoder/x86 | |
| parent | 76eb1b0519ba58a650205dd35779e55857695b0f (diff) | |
| parent | f97f2b1bb6c08661b88324ef15354505dad4a041 (diff) | |
| download | libvpx-ae4db164e5ece4ffdf8d2f460940244763e5052d.tar libvpx-ae4db164e5ece4ffdf8d2f460940244763e5052d.tar.gz libvpx-ae4db164e5ece4ffdf8d2f460940244763e5052d.tar.bz2 libvpx-ae4db164e5ece4ffdf8d2f460940244763e5052d.zip | |
Merge remote branch 'origin/master' into experimental
Change-Id: I7125984ec28a7094195b640d6659590c6eead533
Diffstat (limited to 'vp8/encoder/x86')
| -rw-r--r-- | vp8/encoder/x86/x86_csystemdependent.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/vp8/encoder/x86/x86_csystemdependent.c b/vp8/encoder/x86/x86_csystemdependent.c index c7dffc443..f9b3ea1d8 100644 --- a/vp8/encoder/x86/x86_csystemdependent.c +++ b/vp8/encoder/x86/x86_csystemdependent.c @@ -323,8 +323,9 @@ void vp8_arch_x86_encoder_init(VP8_COMP *cpi) cpi->rtcd.variance.sad8x16x3 = vp8_sad8x16x3_sse3; cpi->rtcd.variance.sad8x8x3 = vp8_sad8x8x3_sse3; cpi->rtcd.variance.sad4x4x3 = vp8_sad4x4x3_sse3; +#if !(CONFIG_REALTIME_ONLY) cpi->rtcd.search.full_search = vp8_full_search_sadx3; - +#endif cpi->rtcd.variance.sad16x16x4d = vp8_sad16x16x4d_sse3; cpi->rtcd.variance.sad16x8x4d = vp8_sad16x8x4d_sse3; cpi->rtcd.variance.sad8x16x4d = vp8_sad8x16x4d_sse3; @@ -353,7 +354,9 @@ void vp8_arch_x86_encoder_init(VP8_COMP *cpi) cpi->rtcd.variance.sad8x16x8 = vp8_sad8x16x8_sse4; cpi->rtcd.variance.sad8x8x8 = vp8_sad8x8x8_sse4; cpi->rtcd.variance.sad4x4x8 = vp8_sad4x4x8_sse4; +#if !(CONFIG_REALTIME_ONLY) cpi->rtcd.search.full_search = vp8_full_search_sadx8; +#endif } #endif |