From ebb5f2f7bd27f1d0bb2b8f49ed717c85b9d49c95 Mon Sep 17 00:00:00 2001
From: "Ronald S. Bultje" <rbultje@google.com>
Date: Tue, 18 Dec 2012 10:38:12 -0800
Subject: [PATCH] Remove redundant "Prob" type (it's a duplicate of vp9_prob).
Change-Id: I9548891d7b8ff672a31579bcdce74e4cea529883
---
vp9/common/vp9_entropy.c | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/vp9/common/vp9_entropy.c b/vp9/common/vp9_entropy.c
index 1e5848843a..ec1fbf61bc 100644
--- a/vp9/common/vp9_entropy.c
+++ b/vp9/common/vp9_entropy.c
@@ -24,8 +24,6 @@
typedef const uchar cuchar;
typedef const uint cuint;
-typedef vp9_prob Prob;
-
#include "vp9/common/vp9_coefupdateprobs.h"
const int vp9_i8x8_block[4] = {0, 2, 8, 10};
@@ -490,12 +488,12 @@ struct vp9_token_struct vp9_coef_encodings[MAX_ENTROPY_TOKENS];
/* Trees for extra bits. Probabilities are constant and
do not depend on previously encoded bits */
-static const Prob Pcat1[] = { 159};
-static const Prob Pcat2[] = { 165, 145};
-static const Prob Pcat3[] = { 173, 148, 140};
-static const Prob Pcat4[] = { 176, 155, 140, 135};
-static const Prob Pcat5[] = { 180, 157, 141, 134, 130};
-static const Prob Pcat6[] = {
+static const vp9_prob Pcat1[] = { 159};
+static const vp9_prob Pcat2[] = { 165, 145};
+static const vp9_prob Pcat3[] = { 173, 148, 140};
+static const vp9_prob Pcat4[] = { 176, 155, 140, 135};
+static const vp9_prob Pcat5[] = { 180, 157, 141, 134, 130};
+static const vp9_prob Pcat6[] = {
254, 254, 254, 252, 249, 243, 230, 196, 177, 153, 140, 133, 130, 129
};
--
GitLab