ref: 4bfde1071e98ddc9668e09d432a81fce11d950c2
parent: dd26b9a6d03671cf70d35faa13698964c5df8191
parent: f610f88be488b1310e7522f1e702c9673501819c
author: Debargha Mukherjee <[email protected]>
date: Thu Dec 4 10:52:35 EST 2014
Merge "Corrected the renaming of CONFIG_VP9_HIGH ro CONFIG_VP9_HIGHBITDEPTH."
--- a/vp9/encoder/vp9_picklpf.c
+++ b/vp9/encoder/vp9_picklpf.c
@@ -153,7 +153,7 @@
const int q = vp9_ac_quant(cm->base_qindex, 0, cm->bit_depth);
// These values were determined by linear fitting the result of the
// searched level, filt_guess = q * 0.316206 + 3.87252
-#if CONFIG_VP9_HIGHDEPTH
+#if CONFIG_VP9_HIGHBITDEPTH
int filt_guess;
switch (cm->bit_depth) {case VPX_BITS_8: