libvpx: Pull from upstream

source/libvpx/vp8/encoder/rdopt.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 47 matching lines @@
                     idx[k] = idx[k - 1];
                 }
 
                 arr[j] = temp ;
                 idx[j] = tempi;
             }
         }
     }
 }
 
-extern void vp8_initialize_rd_consts(VP8_COMP *cpi, int Qvalue);
+extern void vp8_initialize_rd_consts(VP8_COMP *cpi, MACROBLOCK *x, int Qvalue);
 extern void vp8_rd_pick_inter_mode(VP8_COMP *cpi, MACROBLOCK *x, int recon_yoffset, int recon_uvoffset, int *returnrate, int *returndistortion, int *returnintra);
-extern void vp8_rd_pick_intra_mode(VP8_COMP *cpi, MACROBLOCK *x, int *rate);
+extern void vp8_rd_pick_intra_mode(MACROBLOCK *x, int *rate);
 
 
 static void get_plane_pointers(const YV12_BUFFER_CONFIG *fb,
                                unsigned char            *plane[3],
                                unsigned int              recon_yoffset,
                                unsigned int              recon_uvoffset)
 {
     plane[0] = fb->y_buffer + recon_yoffset;
     plane[1] = fb->u_buffer + recon_uvoffset;
     plane[2] = fb->v_buffer + recon_uvoffset;
@@ skipping 43 matching lines @@
     const MODE_INFO *here,
     int_mv *mvp,
     int refframe,
     int *ref_frame_sign_bias,
     int *sr,
     int near_sadidx[]
 );
 void vp8_cal_sad(VP8_COMP *cpi, MACROBLOCKD *xd, MACROBLOCK *x, int recon_yoffset, int near_sadidx[]);
 
 #endif