ref: 1d3f1983b278a3e106f6175ea6ee00b39013be0d
parent: f7c2d2a3de1872451ce91e78c7f6b338f4e40be2
parent: e25d6252a41bcc10bd099569193aac4a032589fc
author: Paul Wilkins <[email protected]>
date: Thu Jun 30 12:26:14 EDT 2016
Merge "Fix error in get_ul_intra_threshold() for 10/12 bit."
--- a/vp9/encoder/vp9_firstpass.c
+++ b/vp9/encoder/vp9_firstpass.c
@@ -506,10 +506,10 @@
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, "