Merge "vp9: fix compilation for g++ 6.2.x"

This commit is contained in:
James Zern 2016-09-28 23:36:23 +00:00 committed by Gerrit Code Review
commit e094e151de

View File

@ -27,12 +27,9 @@ void vp9_init_mv_probs(struct VP9Common *cm);
void vp9_adapt_mv_probs(struct VP9Common *cm, int usehp);
// Integer pel reference mv threshold for use of high-precision 1/8 mv
#define COMPANDED_MVREF_THRESH 8
static INLINE int use_mv_hp(const MV *ref) {
return (abs(ref->row) >> 3) < COMPANDED_MVREF_THRESH &&
(abs(ref->col) >> 3) < COMPANDED_MVREF_THRESH;
const int kMvRefThresh = 64; // threshold for use of high-precision 1/8 mv
return abs(ref->row) < kMvRefThresh && abs(ref->col) < kMvRefThresh;
}
#define MV_UPDATE_PROB 252