summaryrefslogtreecommitdiff
path: root/vp9/encoder/vp9_bitstream.c
diff options
context:
space:
mode:
authorDmitry Kovalev <dkovalev@google.com>2013-04-14 04:31:39 -0700
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>2013-04-14 04:31:39 -0700
commit399a6cbcde18f6759e6ff6ac42af278129db4650 (patch)
treebbfde85cfe1186f9653ae30bceb4a6fa6556a18d /vp9/encoder/vp9_bitstream.c
parent626d06502f9df90bc796e4e107600242a5bca6c5 (diff)
parent24f18e1c34406c023ae57448641374b6e655f18f (diff)
downloadlibvpx-399a6cbcde18f6759e6ff6ac42af278129db4650.tar
libvpx-399a6cbcde18f6759e6ff6ac42af278129db4650.tar.gz
libvpx-399a6cbcde18f6759e6ff6ac42af278129db4650.tar.bz2
libvpx-399a6cbcde18f6759e6ff6ac42af278129db4650.zip
Merge "Renaming vp9_token_struct to vp9_token and removing previous typedef." into experimental
Diffstat (limited to 'vp9/encoder/vp9_bitstream.c')
-rw-r--r--vp9/encoder/vp9_bitstream.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/vp9/encoder/vp9_bitstream.c b/vp9/encoder/vp9_bitstream.c
index ba4c80bd4..9cb448a99 100644
--- a/vp9/encoder/vp9_bitstream.c
+++ b/vp9/encoder/vp9_bitstream.c
@@ -118,7 +118,7 @@ static int prob_diff_update_cost(vp9_prob newp, vp9_prob oldp) {
static void update_mode(
vp9_writer *const bc,
int n,
- vp9_token tok [/* n */],
+ const struct vp9_token tok[/* n */],
vp9_tree tree,
vp9_prob Pnew [/* n-1 */],
vp9_prob Pcur [/* n-1 */],
@@ -458,12 +458,12 @@ static void pack_mb_tokens(vp9_writer* const bc,
while (p < stop) {
const int t = p->Token;
- vp9_token *const a = vp9_coef_encodings + t;
+ const struct vp9_token *const a = vp9_coef_encodings + t;
const vp9_extra_bit_struct *const b = vp9_extra_bits + t;
int i = 0;
const unsigned char *pp = p->context_tree;
int v = a->value;
- int n = a->Len;
+ int n = a->len;
if (t == EOSB_TOKEN)
{