summaryrefslogtreecommitdiff
path: root/vp8/encoder/generic
diff options
context:
space:
mode:
authorJohn Koleszar <jkoleszar@google.com>2011-01-19 00:05:16 -0500
committerJohn Koleszar <jkoleszar@google.com>2011-01-19 00:05:18 -0500
commitae4db164e5ece4ffdf8d2f460940244763e5052d (patch)
treea0f227279d6b4726afb550ee740385a64820a85d /vp8/encoder/generic
parent76eb1b0519ba58a650205dd35779e55857695b0f (diff)
parentf97f2b1bb6c08661b88324ef15354505dad4a041 (diff)
downloadlibvpx-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/generic')
-rw-r--r--vp8/encoder/generic/csystemdependent.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/vp8/encoder/generic/csystemdependent.c b/vp8/encoder/generic/csystemdependent.c
index be00d0218..4738a5b28 100644
--- a/vp8/encoder/generic/csystemdependent.c
+++ b/vp8/encoder/generic/csystemdependent.c
@@ -91,8 +91,9 @@ void vp8_cmachine_specific_config(VP8_COMP *cpi)
cpi->rtcd.quantize.quantb = vp8_regular_quantize_b;
cpi->rtcd.quantize.fastquantb = vp8_fast_quantize_b_c;
-
+#if !(CONFIG_REALTIME_ONLY)
cpi->rtcd.search.full_search = vp8_full_search_sad;
+#endif
cpi->rtcd.search.diamond_search = vp8_diamond_search_sad;
cpi->rtcd.temporal.apply = vp8_temporal_filter_apply_c;