From 15f03c2f137fd5e39e15b71cd5181340be762ac6 Mon Sep 17 00:00:00 2001 From: Gaute Strokkenes Date: Mon, 4 Apr 2011 16:47:22 +0100 Subject: [PATCH] Slightly simplify vp8_decode_mb_tokens. Change-Id: I0058ba7dcfc50a3374b712197639ac337f8726be --- vp8/decoder/detokenize.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) mode change 100644 => 100755 vp8/decoder/detokenize.c diff --git a/vp8/decoder/detokenize.c b/vp8/decoder/detokenize.c old mode 100644 new mode 100755 index b2e0819..c22e0f2 --- a/vp8/decoder/detokenize.c +++ b/vp8/decoder/detokenize.c @@ -181,7 +181,7 @@ int vp8_decode_mb_tokens(VP8D_COMP *dx, MACROBLOCKD *x) { ENTROPY_CONTEXT *A = (ENTROPY_CONTEXT *)x->above_context; ENTROPY_CONTEXT *L = (ENTROPY_CONTEXT *)x->left_context; - const VP8_COMMON *const oc = & dx->common; + const FRAME_CONTEXT * const fc = &dx->common.fc; BOOL_DECODER *bc = x->current_bc; @@ -236,7 +236,7 @@ int vp8_decode_mb_tokens(VP8D_COMP *dx, MACROBLOCKD *x) range = bc->range; - coef_probs = oc->fc.coef_probs [type] [ 0 ] [0]; + coef_probs = fc->coef_probs [type] [ 0 ] [0]; BLOCK_LOOP: a = A + vp8_block2above[i]; @@ -348,7 +348,7 @@ BLOCK_FINISHED: type = 0; i = 0; stop = 16; - coef_probs = oc->fc.coef_probs [type] [ 0 ] [0]; + coef_probs = fc->coef_probs [type] [ 0 ] [0]; qcoeff_ptr -= (24*16 + 16); goto BLOCK_LOOP; } @@ -356,7 +356,7 @@ BLOCK_FINISHED: if (i == 16) { type = 2; - coef_probs = oc->fc.coef_probs [type] [ 0 ] [0]; + coef_probs = fc->coef_probs [type] [ 0 ] [0]; stop = 24; goto BLOCK_LOOP; } -- 2.7.4