diff options
| author | Ronald S. Bultje <rsbultje@gmail.com> | 2015-10-22 21:14:13 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-10-22 21:14:13 +0000 |
| commit | 806ae29d80249af00ff0d6fb38468b4454236b2c (patch) | |
| tree | 7bbd6df787b7f470e29a610f55ed1623ffb7b5ce | |
| parent | d6fc63ac31797a5f537bcf057047b8c7f33394bc (diff) | |
| parent | 194c0a5cfb61a982be92bfbf99f31d835caa9d66 (diff) | |
| download | libvpx-806ae29d80249af00ff0d6fb38468b4454236b2c.tar.gz | |
Merge "vp10: merge universal_hp experiment into misc_fixes."
| -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 |