Merge remote branch 'internal/upstream' into HEAD

diff --cc vp8/encoder/onyx_if.c
index 304996d225faf421536dd90ad95d86a44469c26f,aad326ca2501b0bf810716d574c9212e44dd3cf2..12e7128cd71f8b86e78595aa46060150801bdbe5
--- 1/vp8/encoder/onyx_if.c
--- 2/vp8/encoder/onyx_if.c
+++ b/vp8/encoder/onyx_if.c
@@@ -2124,10 -2160,13 +2157,13 @@@ VP8_PTR vp8_create_compressor(VP8_CONFI
      cpi->alt_is_last  = 0 ;
      cpi->gold_is_alt  = 0 ;
  
- 
+     // allocate memory for storing last frame's MVs for MV prediction.
+     CHECK_MEM_ERROR(cpi->lfmv, vpx_calloc((cpi->common.mb_rows+1) * (cpi->common.mb_cols+1), sizeof(int_mv)));
+     CHECK_MEM_ERROR(cpi->lf_ref_frame_sign_bias, vpx_calloc((cpi->common.mb_rows+1) * (cpi->common.mb_cols+1), sizeof(int)));
+     CHECK_MEM_ERROR(cpi->lf_ref_frame, vpx_calloc((cpi->common.mb_rows+1) * (cpi->common.mb_cols+1), sizeof(int)));
  
      // Create the encoder segmentation map and set all entries to 0
 -    CHECK_MEM_ERROR(cpi->segmentation_map, vpx_calloc(cpi->common.mb_rows * cpi->common.mb_cols, 1));
 +    CHECK_MEM_ERROR(cpi->segmentation_map, vpx_calloc((cpi->common.mb_rows * cpi->common.mb_cols), 1));
      CHECK_MEM_ERROR(cpi->active_map, vpx_calloc(cpi->common.mb_rows * cpi->common.mb_cols, 1));
      vpx_memset(cpi->active_map , 1, (cpi->common.mb_rows * cpi->common.mb_cols));
      cpi->active_map_enabled = 0;

diff --cc vp8/encoder/onyx_int.h
Simple merge