| Index: source/libvpx/vp8/encoder/pickinter.h | 
| =================================================================== | 
| --- source/libvpx/vp8/encoder/pickinter.h	(revision 96967) | 
| +++ source/libvpx/vp8/encoder/pickinter.h	(working copy) | 
| @@ -14,8 +14,6 @@ | 
| #include "vpx_ports/config.h" | 
| #include "vp8/common/onyxc_int.h" | 
|  | 
| -#define RD_ESTIMATE(RM,DM,R,D) ( ((128+(R)*(RM)) >> 8) + (DM)*(D) ) | 
| -extern int vp8_pick_intra4x4mby_modes(const VP8_ENCODER_RTCD *, MACROBLOCK *mb, int *Rate, int *Distortion); | 
| -extern int vp8_pick_intra_mbuv_mode(MACROBLOCK *mb); | 
| -extern int vp8_pick_inter_mode(VP8_COMP *cpi, MACROBLOCK *x, int recon_yoffset, int recon_uvoffset, int *returnrate, int *returndistortion, int *returnintra); | 
| +extern void vp8_pick_inter_mode(VP8_COMP *cpi, MACROBLOCK *x, int recon_yoffset, int recon_uvoffset, int *returnrate, int *returndistortion, int *returnintra); | 
| +extern void vp8_pick_intra_mode(VP8_COMP *cpi, MACROBLOCK *x, int *rate); | 
| #endif | 
|  |