Revert r97185 "Update libvpx snapshot to v0.9.7-p1 (Cayuga)."

libvpx/source/libvpx/vp8/encoder/rdopt.h

Index: libvpx/source/libvpx/vp8/encoder/rdopt.h
diff --git a/libvpx/source/libvpx/vp8/encoder/rdopt.h b/libvpx/source/libvpx/vp8/encoder/rdopt.h
index 95134cb811fccbd1a676c11c9ee56be34840abb0..72ba9a0b5bf8e6850a4e468850d222aece386ff9 100644
--- a/libvpx/source/libvpx/vp8/encoder/rdopt.h
+++ b/libvpx/source/libvpx/vp8/encoder/rdopt.h
@@ -11,19 +11,18 @@
 
 #ifndef __INC_RDOPT_H
 #define __INC_RDOPT_H
-
-#define RDCOST(RM,DM,R,D) ( ((128+(R)*(RM)) >> 8) + (DM)*(D) )
-
-extern void vp8_initialize_rd_consts(VP8_COMP *cpi, 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);
+void vp8_initialize_rd_consts(VP8_COMP *cpi, int Qvalue);
+int vp8_rd_pick_intra4x4mby_modes(VP8_COMP *cpi, MACROBLOCK *mb, int *rate, int *rate_to, int *distortion, int best_rd);
+int vp8_rd_pick_intra16x16mby_mode(VP8_COMP *cpi, MACROBLOCK *x, int *returnrate, int *rate_to, int *returndistortion);
+int vp8_rd_pick_intra_mbuv_mode(VP8_COMP *cpi, MACROBLOCK *x, int *rate, int *rate_to, int *distortion);
+extern int 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_mv_pred
 (
     VP8_COMP *cpi,
     MACROBLOCKD *xd,
     const MODE_INFO *here,
-    int_mv *mvp,
+    MV *mvp,
     int refframe,
     int *ref_frame_sign_bias,
     int *sr,