diff options
| author | Ronald S. Bultje <rsbultje@gmail.com> | 2015-10-21 15:20:22 -0400 |
|---|---|---|
| committer | Ronald S. Bultje <rsbultje@gmail.com> | 2015-10-21 22:27:34 -0400 |
| commit | 194c0a5cfb61a982be92bfbf99f31d835caa9d66 (patch) | |
| tree | ea1e03a358504bc4afb0d0fd84deb56ae13b8789 | |
| parent | aa1125655519965c2c5bd2f99966d23ff6180d8a (diff) | |
| download | libvpx-194c0a5cfb61a982be92bfbf99f31d835caa9d66.tar.gz | |
vp10: merge universal_hp experiment into misc_fixes.
Change-Id: I79fc3c0594535adc0056339c929cff69b8188760
| -rwxr-xr-x | configure | 1 | ||||
| -rw-r--r-- | vp10/common/entropymv.c | 2 |
2 files changed, 1 insertions, 2 deletions
@@ -265,7 +265,6 @@ EXPERIMENT_LIST=" fp_mb_stats emulate_hardware misc_fixes - universal_hp ext_ipred_bltr " CONFIG_LIST=" 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 |