Merge remote branch 'origin/master' into experimental

Change-Id: I53be500dad1a98e21d0a28f9e07761d8d03fdcf6

diff --cc vp8/decoder/detokenize.c
index 1d056bbb29e8501d15141e65e3df2b415c7f25ae,c22e0f28c2c763353c738b42188e177b5fb14ac9..2d050512af0988b3ddb6a4f2fa631e6a544543fb
mode 100644,100755..100755
--- 1/vp8/decoder/detokenize.c
--- 2/vp8/decoder/detokenize.c
+++ b/vp8/decoder/detokenize.c

diff --cc vp8/encoder/encodeframe.c
Simple merge

diff --cc vp8/encoder/firstpass.c
index 3ebbba4d6143afeffa03ead718c8b5358b9309d0,dd0152dcb7f33b5d1c839ad899b149957379d483..9a777486332a85aeb030828b1cef8652ac4e8e0c
--- 1/vp8/encoder/firstpass.c
--- 2/vp8/encoder/firstpass.c
+++ b/vp8/encoder/firstpass.c
@@@ -538,9 -538,9 +538,9 @@@ void vp8_first_pass(VP8_COMP *cpi
      //if ( 0 )
      {
          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, 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, cpi->mb.mvsadcost, (const MV_CONTEXT *) cm->fc.mvc, flag);
+         vp8_build_component_cost_table(cpi->mb.mvcost, (const MV_CONTEXT *) cm->fc.mvc, flag);
      }
  
      // for each macroblock row in image

diff --cc vp8/encoder/onyx_if.c
Simple merge

diff --cc vp8/encoder/ratectrl.c
Simple merge

diff --cc vp8/encoder/rdopt.c
Simple merge