libvpx: Pull from upstream

source/libvpx/vp8/common/reconintra.c

 /*
  *  Copyright (c) 2010 The WebM project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 18 matching lines @@
     {
         yleft_col[i] = yleft[i* left_stride];
     }
 
     /* for Y */
     switch (x->mode_info_context->mbmi.mode)
     {
     case DC_PRED:
     {
         int expected_dc;
-        int i;
         int shift;
         int average = 0;
 
 
         if (x->up_available || x->left_available)
         {
             if (x->up_available)
             {
                 for (i = 0; i < 16; i++)
                 {
@@ skipping 111 matching lines @@
         uleft_col[i] = uleft [i* left_stride];
         vleft_col[i] = vleft [i* left_stride];
     }
 
     switch (x->mode_info_context->mbmi.uv_mode)
     {
     case DC_PRED:
     {
         int expected_udc;
         int expected_vdc;
-        int i;
         int shift;
         int Uaverage = 0;
         int Vaverage = 0;
 
         if (x->up_available)
         {
             for (i = 0; i < 8; i++)
             {
                 Uaverage += uabove_row[i];
                 Vaverage += vabove_row[i];
@@ skipping 28 matching lines @@
         {
             vpx_memset(upred_ptr, expected_udc, 8);
             vpx_memset(vpred_ptr, expected_vdc, 8);
             upred_ptr += pred_stride;
             vpred_ptr += pred_stride;
         }
     }
     break;
     case V_PRED:
     {
-        int i;
-
         for (i = 0; i < 8; i++)
         {
             vpx_memcpy(upred_ptr, uabove_row, 8);
             vpx_memcpy(vpred_ptr, vabove_row, 8);
             upred_ptr += pred_stride;
             vpred_ptr += pred_stride;
         }
 
     }
     break;
     case H_PRED:
     {
-        int i;
-
         for (i = 0; i < 8; i++)
         {
             vpx_memset(upred_ptr, uleft_col[i], 8);
             vpx_memset(vpred_ptr, vleft_col[i], 8);
             upred_ptr += pred_stride;
             vpred_ptr += pred_stride;
         }
     }
 
     break;
     case TM_PRED:
     {
-        int i;
-
         for (i = 0; i < 8; i++)
         {
             for (j = 0; j < 8; j++)
             {
                 int predu = uleft_col[i] + uabove_row[j] - utop_left;
                 int predv = vleft_col[i] + vabove_row[j] - vtop_left;
 
                 if (predu < 0)
                     predu = 0;
 
@@ skipping 19 matching lines @@
     case B_PRED:
     case NEARESTMV:
     case NEARMV:
     case ZEROMV:
     case NEWMV:
     case SPLITMV:
     case MB_MODE_COUNT:
         break;
     }
 }