summaryrefslogtreecommitdiff
path: root/vp10/common
diff options
context:
space:
mode:
authorRonald S. Bultje <rsbultje@gmail.com>2015-10-22 21:14:13 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2015-10-22 21:14:13 +0000
commit806ae29d80249af00ff0d6fb38468b4454236b2c (patch)
tree7bbd6df787b7f470e29a610f55ed1623ffb7b5ce /vp10/common
parentd6fc63ac31797a5f537bcf057047b8c7f33394bc (diff)
parent194c0a5cfb61a982be92bfbf99f31d835caa9d66 (diff)
downloadlibvpx-806ae29d80249af00ff0d6fb38468b4454236b2c.tar
libvpx-806ae29d80249af00ff0d6fb38468b4454236b2c.tar.gz
libvpx-806ae29d80249af00ff0d6fb38468b4454236b2c.tar.bz2
libvpx-806ae29d80249af00ff0d6fb38468b4454236b2c.zip
Merge "vp10: merge universal_hp experiment into misc_fixes."
Diffstat (limited to 'vp10/common')
-rw-r--r--vp10/common/entropymv.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/vp10/common/entropymv.c b/vp10/common/entropymv.c
index fd11d9005..a9946ee15 100644
--- a/vp10/common/entropymv.c
+++ b/vp10/common/entropymv.c
@@ -128,7 +128,7 @@ MV_CLASS_TYPE vp10_get_mv_class(int z, int *offset) {
}
int vp10_use_mv_hp(const MV *ref) {
-#if CONFIG_UNIVERSAL_HP
+#if CONFIG_MISC_FIXES
(void) ref;
return 1;
#else