Merge "Bug in scale_sse_threshold()"

This commit is contained in:
Paul Wilkins 2017-02-16 10:01:45 +00:00 committed by Gerrit Code Review
commit 9216ba58d8

View File

@ -469,8 +469,8 @@ static int scale_sse_threshold(VP9_COMMON *cm, int thresh) {
if (cm->use_highbitdepth) {
switch (cm->bit_depth) {
case VPX_BITS_8: ret_val = thresh; break;
case VPX_BITS_10: ret_val = thresh >> 4; break;
case VPX_BITS_12: ret_val = thresh >> 8; break;
case VPX_BITS_10: ret_val = thresh << 4; break;
case VPX_BITS_12: ret_val = thresh << 8; break;
default:
assert(0 &&
"cm->bit_depth should be VPX_BITS_8, "