libvpx: Fix pull from upstream

source/libvpx/vp8/encoder/onyx_int.h

 /*
  *  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 331 matching lines @@
 
     unsigned int frames_since_key;
     unsigned int key_frame_frequency;
     unsigned int this_key_frame_forced;
     unsigned int next_key_frame_forced;
 
     /* Ambient reconstruction err target for force key frames */
     int ambient_err;
 
     unsigned int mode_check_freq[MAX_MODES];
-    unsigned int mode_chosen_counts[MAX_MODES];
 
     int rd_baseline_thresh[MAX_MODES];
 
     int RDMULT;
     int RDDIV ;
 
     CODING_CONTEXT coding_context;
 
     /* Rate targetting variables */
     int64_t last_prediction_error;
@@ skipping 347 matching lines @@
     } while(0)
 #else
 #define CHECK_MEM_ERROR(lval,expr) do {\
         lval = (expr); \
         if(!lval) \
             vpx_internal_error(&cpi->common.error, VPX_CODEC_MEM_ERROR,\
                                "Failed to allocate "#lval);\
     } while(0)
 #endif
 #endif