summaryrefslogtreecommitdiff
path: root/vp9/common
diff options
context:
space:
mode:
authorJames Zern <jzern@google.com>2013-07-22 19:16:54 -0700
committerJames Zern <jzern@google.com>2013-07-22 19:19:13 -0700
commit3c8cce353fe9579203b88c1dcd2f245ee85d654d (patch)
tree66392c3249035f09801a0ed3cbc318ed89b640ee /vp9/common
parentab139094ed32ea22ab1fdb5ac645f1a629ada3e6 (diff)
downloadlibvpx-3c8cce353fe9579203b88c1dcd2f245ee85d654d.tar
libvpx-3c8cce353fe9579203b88c1dcd2f245ee85d654d.tar.gz
libvpx-3c8cce353fe9579203b88c1dcd2f245ee85d654d.tar.bz2
libvpx-3c8cce353fe9579203b88c1dcd2f245ee85d654d.zip
vp9: make some static tables const
Change-Id: I8bcae51271673da8755c66a51aea005dfe6a3739
Diffstat (limited to 'vp9/common')
-rw-r--r--vp9/common/vp9_mvref_common.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/vp9/common/vp9_mvref_common.c b/vp9/common/vp9_mvref_common.c
index 778eedc58..253a138c1 100644
--- a/vp9/common/vp9_mvref_common.c
+++ b/vp9/common/vp9_mvref_common.c
@@ -11,7 +11,7 @@
#include "vp9/common/vp9_mvref_common.h"
#define MVREF_NEIGHBOURS 8
-static int mv_ref_blocks[BLOCK_SIZE_TYPES][MVREF_NEIGHBOURS][2] = {
+static const int mv_ref_blocks[BLOCK_SIZE_TYPES][MVREF_NEIGHBOURS][2] = {
// SB4X4
{{0, -1}, {-1, 0}, {-1, -1}, {0, -2}, {-2, 0}, {-1, -2}, {-2, -1}, {-2, -2}},
// SB4X8
@@ -150,7 +150,7 @@ void vp9_find_mv_refs_idx(VP9_COMMON *cm, MACROBLOCKD *xd, MODE_INFO *here,
int candidate_scores[MAX_MV_REF_CANDIDATES] = { 0 };
int refmv_count = 0;
int split_count = 0;
- int (*mv_ref_search)[2];
+ const int (*mv_ref_search)[2] = mv_ref_blocks[mbmi->sb_type];
const int mi_col = get_mi_col(xd);
const int mi_row = get_mi_row(xd);
int intra_count = 0;
@@ -161,7 +161,6 @@ void vp9_find_mv_refs_idx(VP9_COMMON *cm, MACROBLOCKD *xd, MODE_INFO *here,
// Blank the reference vector lists and other local structures.
vpx_memset(mv_ref_list, 0, sizeof(int_mv) * MAX_MV_REF_CANDIDATES);
- mv_ref_search = mv_ref_blocks[mbmi->sb_type];
if (mbmi->sb_type < BLOCK_SIZE_SB8X8) {
x_idx = block_idx & 1;
y_idx = block_idx >> 1;