Merge "Fix error in get_ul_intra_threshold() for 10/12 bit."

This commit is contained in:
Paul Wilkins 2016-06-30 16:26:14 +00:00 committed by Gerrit Code Review
commit 1d3f1983b2

View File

@ -506,10 +506,10 @@ static int get_ul_intra_threshold(VP9_COMMON *cm) {
ret_val = UL_INTRA_THRESH;
break;
case VPX_BITS_10:
ret_val = UL_INTRA_THRESH >> 2;
ret_val = UL_INTRA_THRESH << 2;
break;
case VPX_BITS_12:
ret_val = UL_INTRA_THRESH >> 4;
ret_val = UL_INTRA_THRESH << 4;
break;
default:
assert(0 && "cm->bit_depth should be VPX_BITS_8, "