From: John Koleszar <jkoleszar@google.com>
Date: Tue, 26 Jul 2011 14:30:33 +0000 (-0400)
Subject: Make cat6 probs properly dependent on CONFIG_EXTEND_QRANGE
X-Git-Tag: v1.3.0~1217^2~410
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=eccfca5165f24e322135898c079319030a8b7ecc;p=libvpx

Make cat6 probs properly dependent on CONFIG_EXTEND_QRANGE

Change-Id: I2ac5d8818acb50f9db38de8cb562f337e51006b2
---

diff --git a/vp8/decoder/detokenize.c b/vp8/decoder/detokenize.c
index 795a3082f..98be68558 100644
--- a/vp8/decoder/detokenize.c
+++ b/vp8/decoder/detokenize.c
@@ -64,9 +64,13 @@ DECLARE_ALIGNED(16, static const unsigned char, coef_bands_x[16]) =
 #define CAT5_PROB3 157
 #define CAT5_PROB4 180
 
+#if CONFIG_EXTEND_QRANGE
 static const unsigned char cat6_prob[14] =
 { 129, 130, 133, 140, 153, 177, 196, 230, 243, 249, 252, 254, 254, 0 };
-
+#else
+static const unsigned char cat6_prob[12] =
+{ 129, 130, 133, 140, 153, 177, 196, 230, 243, 254, 254, 0 };
+#endif
 
 void vp8_reset_mb_tokens_context(MACROBLOCKD *x)
 {
@@ -271,7 +275,7 @@ CHECK_0_:
                               CAT_FIVE_CONTEXT_NODE_0_);
 
     val = CAT6_MIN_VAL;
-    bits_count = 12;
+    bits_count = CONFIG_EXTEND_QRANGE?12:10;
 
     do
     {