4 files changed, 4 insertions, 30 deletions
diff --git a/vp9/encoder/vp9_encodeframe.c b/vp9/encoder/vp9_encodeframe.c
index 76176be65..6ab23cae0 100644
--- a/vp9/encoder/vp9_encodeframe.c
+++ b/vp9/encoder/vp9_encodeframe.c
@@ -462,7 +462,7 @@ static void update_state(VP9_COMP *cpi, MACROBLOCK *x,
   if (mb_mode == B_PRED) {
     for (i = 0; i < 16; i++) {
       xd->block[i].bmi.as_mode = xd->mode_info_context->bmi[i].as_mode;
-      assert(xd->block[i].bmi.as_mode.first < MB_MODE_COUNT);
+      assert(xd->block[i].bmi.as_mode.first < B_MODE_COUNT);
     }
   } else if (mb_mode == I8X8_PRED) {
     for (i = 0; i < 16; i++) {
@@ -930,7 +930,7 @@ static void pick_sb_modes (VP9_COMP *cpi,
     xd->mode_info_context->mbmi.segment_id = 0;
 
   x->active_ptr = cpi->active_map + map_index;
-  
+
   cpi->update_context = 0;    // TODO Do we need this now??
 
   /* Find best coding mode & reconstruct the MB so it is available
diff --git a/vp9/encoder/vp9_mbgraph.c b/vp9/encoder/vp9_mbgraph.c
index 059572e24..8511bc572 100644
--- a/vp9/encoder/vp9_mbgraph.c
+++ b/vp9/encoder/vp9_mbgraph.c
@@ -367,8 +367,6 @@ static void separate_arf_mbs(VP9_COMP *cpi) {
   CHECK_MEM_ERROR(arf_not_zz,
                   vpx_calloc(cm->mb_rows * cm->mb_cols * sizeof(*arf_not_zz), 1));
 
-  vpx_memset(arf_not_zz, 0, sizeof(arf_not_zz));
-
   // We are not interested in results beyond the alt ref itself.
   if (n_frames > cpi->frames_till_gf_update_due)
     n_frames = cpi->frames_till_gf_update_due;
diff --git a/vp9/encoder/x86/vp9_variance_mmx.c b/vp9/encoder/x86/vp9_variance_mmx.c
index fa69130a1..bad1cfa74 100644
--- a/vp9/encoder/x86/vp9_variance_mmx.c
+++ b/vp9/encoder/x86/vp9_variance_mmx.c
@@ -191,31 +191,7 @@ unsigned int vp9_variance8x16_mmx(
 
 }
 
-
-
-
-///////////////////////////////////////////////////////////////////////////
-// the mmx function that does the bilinear filtering and var calculation //
-// int one pass                                                          //
-///////////////////////////////////////////////////////////////////////////
-DECLARE_ALIGNED(16, const short, vp9_bilinear_filters_mmx[16][8]) = {
-  { 128, 128, 128, 128,  0,  0,  0,  0 },
-  { 120, 120, 120, 120,  8,  8,  8,  8 },
-  { 112, 112, 112, 112, 16, 16, 16, 16 },
-  { 104, 104, 104, 104, 24, 24, 24, 24 },
-  {  96, 96, 96, 96, 32, 32, 32, 32 },
-  {  88, 88, 88, 88, 40, 40, 40, 40 },
-  {  80, 80, 80, 80, 48, 48, 48, 48 },
-  {  72, 72, 72, 72, 56, 56, 56, 56 },
-  {  64, 64, 64, 64, 64, 64, 64, 64 },
-  {  56, 56, 56, 56, 72, 72, 72, 72 },
-  {  48, 48, 48, 48, 80, 80, 80, 80 },
-  {  40, 40, 40, 40, 88, 88, 88, 88 },
-  {  32, 32, 32, 32, 96, 96, 96, 96 },
-  {  24, 24, 24, 24, 104, 104, 104, 104 },
-  {  16, 16, 16, 16, 112, 112, 112, 112 },
-  {   8,  8,  8,  8, 120, 120, 120, 120 }
-};
+DECLARE_ALIGNED(16, extern const short, vp9_bilinear_filters_mmx[16][8]);
 
 unsigned int vp9_sub_pixel_variance4x4_mmx
 (
diff --git a/vp9/encoder/x86/vp9_variance_sse2.c b/vp9/encoder/x86/vp9_variance_sse2.c
index 280efcd7a..36fae6e8c 100644
--- a/vp9/encoder/x86/vp9_variance_sse2.c
+++ b/vp9/encoder/x86/vp9_variance_sse2.c
@@ -137,7 +137,7 @@ void vp9_half_vert_variance16x_h_sse2
   unsigned int *sumsquared
 );
 
-DECLARE_ALIGNED(16, extern short, vp9_bilinear_filters_mmx[16][8]);
+DECLARE_ALIGNED(16, extern const short, vp9_bilinear_filters_mmx[16][8]);
 
 unsigned int vp9_variance4x4_wmt(
   const unsigned char *src_ptr,