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

libvpx/source/libvpx/vp8/encoder/arm/quantize_arm.h

Index: libvpx/source/libvpx/vp8/encoder/arm/quantize_arm.h
diff --git a/libvpx/source/libvpx/vp8/encoder/arm/quantize_arm.h b/libvpx/source/libvpx/vp8/encoder/arm/quantize_arm.h
index 7d2088d2d875b60c2fa374398b38d12e92dbc230..0c6adf4c25bc4a67bfcdd659f10cfa2d667f4831 100644
--- a/libvpx/source/libvpx/vp8/encoder/arm/quantize_arm.h
+++ b/libvpx/source/libvpx/vp8/encoder/arm/quantize_arm.h
@@ -16,37 +16,21 @@
 
 extern prototype_quantize_block(vp8_fast_quantize_b_armv6);
 
-#if !CONFIG_RUNTIME_CPU_DETECT
 #undef  vp8_quantize_fastquantb
 #define vp8_quantize_fastquantb vp8_fast_quantize_b_armv6
-#endif
 
 #endif /* HAVE_ARMV6 */
 
 
 #if HAVE_ARMV7
-
 extern prototype_quantize_block(vp8_fast_quantize_b_neon);
-extern prototype_quantize_block_pair(vp8_fast_quantize_b_pair_neon);
-
-#if !CONFIG_RUNTIME_CPU_DETECT
-#undef  vp8_quantize_fastquantb
-#define vp8_quantize_fastquantb vp8_fast_quantize_b_neon
-
-#undef  vp8_quantize_fastquantb_pair
-#define vp8_quantize_fastquantb_pair vp8_fast_quantize_b_pair_neon
 
-#undef vp8_quantize_mb
-#define vp8_quantize_mb vp8_quantize_mb_neon
-
-#undef vp8_quantize_mbuv
-#define vp8_quantize_mbuv vp8_quantize_mbuv_neon
+/* The neon quantizer has not been updated to match the new exact
+ * quantizer introduced in commit e04e2935
+ */
+//#undef  vp8_quantize_fastquantb
+//#define vp8_quantize_fastquantb vp8_fast_quantize_b_neon
 
-#undef vp8_quantize_mby
-#define vp8_quantize_mby vp8_quantize_mby_neon
 #endif
 
-#endif /* HAVE_ARMV7 */
-
 #endif
-