summaryrefslogtreecommitdiff
path: root/vp8/encoder/rdopt.c
diff options
context:
space:
mode:
authorJohn Koleszar <jkoleszar@google.com>2011-06-28 17:03:47 -0400
committerJohn Koleszar <jkoleszar@google.com>2011-06-28 17:03:55 -0400
commitb32da7c3da9103f2aff7054f7db469775b8f2931 (patch)
treee68a819c047ec29e86095bdf1d1ce9612b86a247 /vp8/encoder/rdopt.c
parent9bcf07ae4a1ebd83713350ce7ef9c1d47de9d30f (diff)
downloadlibvpx-b32da7c3da9103f2aff7054f7db469775b8f2931.tar
libvpx-b32da7c3da9103f2aff7054f7db469775b8f2931.tar.gz
libvpx-b32da7c3da9103f2aff7054f7db469775b8f2931.tar.bz2
libvpx-b32da7c3da9103f2aff7054f7db469775b8f2931.zip
Use MAX_ENTROPY_TOKENS and ENTROPY_NODES more consistently
There were many instances in the code of vp8_coef_tokens and vp8_coef_tokens-1, which was a preprocessor macro despite the naming convention. Replace these with MAX_ENTROPY_TOKENS and ENTROPY_NODES, respectively. Change-Id: I72c4f6c7634c94e1fa066cd511471e5592c748da
Diffstat (limited to 'vp8/encoder/rdopt.c')
-rw-r--r--vp8/encoder/rdopt.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/vp8/encoder/rdopt.c b/vp8/encoder/rdopt.c
index e05ffdb1a..e0359057a 100644
--- a/vp8/encoder/rdopt.c
+++ b/vp8/encoder/rdopt.c
@@ -134,8 +134,8 @@ const MV_REFERENCE_FRAME vp8_ref_frame_order[MAX_MODES] =
};
static void fill_token_costs(
- unsigned int c [BLOCK_TYPES] [COEF_BANDS] [PREV_COEF_CONTEXTS] [vp8_coef_tokens],
- const vp8_prob p [BLOCK_TYPES] [COEF_BANDS] [PREV_COEF_CONTEXTS] [vp8_coef_tokens-1]
+ unsigned int c [BLOCK_TYPES] [COEF_BANDS] [PREV_COEF_CONTEXTS] [MAX_ENTROPY_TOKENS],
+ const vp8_prob p [BLOCK_TYPES] [COEF_BANDS] [PREV_COEF_CONTEXTS] [ENTROPY_NODES]
)
{
int i, j, k;