libvpx: 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 493 matching lines @@
 
     /* Video conferencing cyclic refresh mode flags. This is a mode
      * designed to clean up the background over time in live encoding
      * scenarious. It uses segmentation.
      */
     int cyclic_refresh_mode_enabled;
     int cyclic_refresh_mode_max_mbs_perframe;
     int cyclic_refresh_mode_index;
     int cyclic_refresh_q;
     signed char *cyclic_refresh_map;
+    // Count on how many (consecutive) times a macroblock uses ZER0MV_LAST.
+    unsigned char *consec_zero_last;
 
     // Frame counter for the temporal pattern. Counter is rest when the temporal
     // layers are changed dynamically (run-time change).
     unsigned int temporal_pattern_counter;
 
 #if CONFIG_MULTITHREAD
     /* multithread data */
     int * mt_current_mb_col;
     int mt_sync_range;
     int b_multi_threaded;
@@ skipping 151 matching lines @@
     double total_ssimg_y_in_layer[VPX_TS_MAX_LAYERS];
     double total_ssimg_u_in_layer[VPX_TS_MAX_LAYERS];
     double total_ssimg_v_in_layer[VPX_TS_MAX_LAYERS];
     double total_ssimg_all_in_layer[VPX_TS_MAX_LAYERS];
 
 #if CONFIG_MULTI_RES_ENCODING
     /* Number of MBs per row at lower-resolution level */
     int    mr_low_res_mb_cols;
     /* Indicate if lower-res mv info is available */
     unsigned char  mr_low_res_mv_avail;
+#endif
     /* The frame number of each reference frames */
     unsigned int current_ref_frames[MAX_REF_FRAMES];
-#endif
+    MV_REFERENCE_FRAME closest_reference_frame;
 
     struct rd_costs_struct
     {
         int mvcosts[2][MVvals+1];
         int mvsadcosts[2][MVfpvals+1];
         int mbmode_cost[2][MB_MODE_COUNT];
         int intra_uv_mode_cost[2][MB_MODE_COUNT];
         int bmode_costs[10][10][10];
         int inter_bmode_costs[B_MODE_COUNT];
         int token_costs[BLOCK_TYPES][COEF_BANDS]
@@ skipping 22 matching lines @@
         if(!lval) \
             vpx_internal_error(&cpi->common.error, VPX_CODEC_MEM_ERROR,\
                                "Failed to allocate "#lval);\
     } while(0)
 #endif
 #ifdef __cplusplus
 }  // extern "C"
 #endif
 
 #endif  // VP8_ENCODER_ONYX_INT_H_