Merge "vp10: merge universal_hp experiment into misc_fixes."

This commit is contained in:
Ronald S. Bultje 2015-10-22 21:14:13 +00:00 committed by Gerrit Code Review
commit 806ae29d80
2 changed files with 1 additions and 2 deletions

1
configure vendored
View File

@ -265,7 +265,6 @@ EXPERIMENT_LIST="
fp_mb_stats
emulate_hardware
misc_fixes
universal_hp
ext_ipred_bltr
"
CONFIG_LIST="

View File

@ -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