diff options
| author | Ronald S. Bultje <rbultje@google.com> | 2012-12-18 14:17:16 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2012-12-18 14:17:18 -0800 |
| commit | 58961c74ea62062c5d8d50ce6b97aab33bce20f3 (patch) | |
| tree | 1506e983b212886b5ec8a0a00cf884c13dc032f8 | |
| parent | 779c5f28a8be1d4d7aa689076aa466e46273920a (diff) | |
| parent | ebb5f2f7bd27f1d0bb2b8f49ed717c85b9d49c95 (diff) | |
| download | libvpx-58961c74ea62062c5d8d50ce6b97aab33bce20f3.tar libvpx-58961c74ea62062c5d8d50ce6b97aab33bce20f3.tar.gz libvpx-58961c74ea62062c5d8d50ce6b97aab33bce20f3.tar.bz2 libvpx-58961c74ea62062c5d8d50ce6b97aab33bce20f3.zip | |
Merge "Remove redundant "Prob" type (it's a duplicate of vp9_prob)." into experimental
| -rw-r--r-- | vp9/common/vp9_entropy.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/vp9/common/vp9_entropy.c b/vp9/common/vp9_entropy.c index 1e5848843..ec1fbf61b 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 }; |