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

libvpx/source/libvpx/vp8/encoder/encodeintra.h

Index: libvpx/source/libvpx/vp8/encoder/encodeintra.h
diff --git a/libvpx/source/libvpx/vp8/encoder/encodeintra.h b/libvpx/source/libvpx/vp8/encoder/encodeintra.h
index 9c1fa56842507dda7ddffc50b33f977508555c44..40930bc423a6cd0aa2c37295a10fcd65d487e511 100644
--- a/libvpx/source/libvpx/vp8/encoder/encodeintra.h
+++ b/libvpx/source/libvpx/vp8/encoder/encodeintra.h
@@ -13,10 +13,10 @@
 #define _ENCODEINTRA_H_
 #include "onyx_int.h"
 
-int vp8_encode_intra(VP8_COMP *cpi, MACROBLOCK *x, int use_dc_pred);
 void vp8_encode_intra16x16mby(const VP8_ENCODER_RTCD *, MACROBLOCK *x);
 void vp8_encode_intra16x16mbuv(const VP8_ENCODER_RTCD *, MACROBLOCK *x);
 void vp8_encode_intra4x4mby(const VP8_ENCODER_RTCD *, MACROBLOCK *mb);
-void vp8_encode_intra4x4block(const VP8_ENCODER_RTCD *rtcd,
-                              MACROBLOCK *x, int ib);
+void vp8_encode_intra4x4block(const VP8_ENCODER_RTCD *, MACROBLOCK *x, BLOCK *be, BLOCKD *b, int best_mode);
+void vp8_encode_intra4x4block_rd(const VP8_ENCODER_RTCD *, MACROBLOCK *x, BLOCK *be, BLOCKD *b, int best_mode);
+
 #endif