libvpx: Pull from upstream

source/libvpx/vp8/encoder/firstpass.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.
  */
 
 #include <math.h>
 #include <limits.h>
 #include <stdio.h>
 
 #include "./vpx_scale_rtcd.h"
 #include "block.h"
 #include "onyx_int.h"
 #include "vp8/common/variance.h"
 #include "encodeintra.h"
 #include "vp8/common/setupintrarecon.h"
 #include "vp8/common/systemdependent.h"
 #include "mcomp.h"
 #include "firstpass.h"
-#include "vpx_scale/vpxscale.h"
+#include "vpx_scale/vpx_scale.h"
 #include "encodemb.h"
 #include "vp8/common/extend.h"
 #include "vpx_mem/vpx_mem.h"
 #include "vp8/common/swapyv12buffer.h"
 #include "rdopt.h"
 #include "vp8/common/quant_common.h"
 #include "encodemv.h"
 #include "encodeframe.h"
 
 /* #define OUTPUT_FPF 1 */
@@ skipping 528 matching lines @@
 
     vp8_build_block_offsets(x);
 
     /* set up frame new frame for intra coded blocks */
     vp8_setup_intra_recon(new_yv12);
     vp8cx_frame_init_quantizer(cpi);
 
     /* Initialise the MV cost table to the defaults */
     {
         int flag[2] = {1, 1};
-        vp8_initialize_rd_consts(cpi, vp8_dc_quant(cm->base_qindex, cm->y1dc_delta_q));
+        vp8_initialize_rd_consts(cpi, x, vp8_dc_quant(cm->base_qindex, cm->y1dc_delta_q));
         vpx_memcpy(cm->fc.mvc, vp8_default_mv_context, sizeof(vp8_default_mv_context));
         vp8_build_component_cost_table(cpi->mb.mvcost, (const MV_CONTEXT *) cm->fc.mvc, flag);
     }
 
     /* for each macroblock row in image */
     for (mb_row = 0; mb_row < cm->mb_rows; mb_row++)
     {
         int_mv best_ref_mv;
 
         best_ref_mv.as_int = 0;
@@ skipping 2768 matching lines @@
         }
 
         if ((cpi->common.Width != new_width) || (cpi->common.Height != new_height))
         {
             cpi->common.Width = new_width;
             cpi->common.Height = new_height;
             vp8_alloc_compressor_data(cpi);
         }
     }
 }