diff --git a/Android.bp b/Android.bp
index fc6a81fc6..691686aad 100644
--- a/Android.bp
+++ b/Android.bp
@@ -11,6 +11,7 @@ cc_library {
         "source/compare_gcc.cc",
         "source/compare_neon.cc",
         "source/compare_neon64.cc",
+        "source/compare_mmi.cc",
         "source/compare_msa.cc",
         "source/convert.cc",
         "source/convert_argb.cc",
@@ -25,12 +26,14 @@ cc_library {
         "source/rotate_argb.cc",
         "source/rotate_common.cc",
         "source/rotate_gcc.cc",
+        "source/rotate_mmi.cc",
         "source/rotate_msa.cc",
         "source/rotate_neon.cc",
         "source/rotate_neon64.cc",
         "source/row_any.cc",
         "source/row_common.cc",
         "source/row_gcc.cc",
+        "source/row_mmi.cc",
         "source/row_msa.cc",
         "source/row_neon.cc",
         "source/row_neon64.cc",
@@ -39,6 +42,7 @@ cc_library {
         "source/scale_argb.cc",
         "source/scale_common.cc",
         "source/scale_gcc.cc",
+        "source/scale_mmi.cc",
         "source/scale_msa.cc",
         "source/scale_neon.cc",
         "source/scale_neon64.cc",
diff --git a/Android.mk b/Android.mk
index dbc6cad37..0975d64a3 100644
--- a/Android.mk
+++ b/Android.mk
@@ -9,6 +9,7 @@ LOCAL_SRC_FILES := \
     source/compare.cc           \
     source/compare_common.cc    \
     source/compare_gcc.cc       \
+    source/compare_mmi.cc       \
     source/compare_msa.cc       \
     source/compare_neon.cc      \
     source/compare_neon64.cc    \
@@ -25,12 +26,14 @@ LOCAL_SRC_FILES := \
     source/rotate_argb.cc       \
     source/rotate_common.cc     \
     source/rotate_gcc.cc        \
+    source/rotate_mmi.cc        \
     source/rotate_msa.cc        \
     source/rotate_neon.cc       \
     source/rotate_neon64.cc     \
     source/row_any.cc           \
     source/row_common.cc        \
     source/row_gcc.cc           \
+    source/row_mmi.cc           \
     source/row_msa.cc           \
     source/row_neon.cc          \
     source/row_neon64.cc        \
@@ -39,6 +42,7 @@ LOCAL_SRC_FILES := \
     source/scale_argb.cc        \
     source/scale_common.cc      \
     source/scale_gcc.cc         \
+    source/scale_mmi.cc         \
     source/scale_msa.cc         \
     source/scale_neon.cc        \
     source/scale_neon64.cc      \
diff --git a/README.chromium b/README.chromium
index 4ecdcb284..27eef1ddc 100644
--- a/README.chromium
+++ b/README.chromium
@@ -1,6 +1,6 @@
 Name: libyuv
 URL: http://code.google.com/p/libyuv/
-Version: 1714
+Version: 1715
 License: BSD
 License File: LICENSE
 
diff --git a/include/libyuv/version.h b/include/libyuv/version.h
index 249f61f71..6b7400774 100644
--- a/include/libyuv/version.h
+++ b/include/libyuv/version.h
@@ -11,6 +11,6 @@
 #ifndef INCLUDE_LIBYUV_VERSION_H_
 #define INCLUDE_LIBYUV_VERSION_H_
 
-#define LIBYUV_VERSION 1714
+#define LIBYUV_VERSION 1715
 
 #endif  // INCLUDE_LIBYUV_VERSION_H_
diff --git a/libyuv_test.gyp b/libyuv_test.gyp
index d517754c3..e3509dc7c 100644
--- a/libyuv_test.gyp
+++ b/libyuv_test.gyp
@@ -11,6 +11,7 @@
     # Can be enabled if your jpeg has GYP support.
     'libyuv_disable_jpeg%': 1,
     'mips_msa%': 0,  # Default to msa off.
+    'mips_mmi%': 0,  # Default to mmi off.
   },
   'targets': [
     {
diff --git a/linux.mk b/linux.mk
index 3cb6adddd..e9a26a79b 100644
--- a/linux.mk
+++ b/linux.mk
@@ -13,6 +13,7 @@ LOCAL_OBJ_FILES := \
 	source/compare.o           \
 	source/compare_common.o    \
 	source/compare_gcc.o       \
+	source/compare_mmi.o       \
 	source/compare_msa.o       \
 	source/compare_neon64.o    \
 	source/compare_neon.o      \
@@ -33,6 +34,7 @@ LOCAL_OBJ_FILES := \
 	source/rotate.o            \
 	source/rotate_common.o     \
 	source/rotate_gcc.o        \
+	source/rotate_mmi.o        \
 	source/rotate_msa.o        \
 	source/rotate_neon64.o     \
 	source/rotate_neon.o       \
@@ -40,6 +42,7 @@ LOCAL_OBJ_FILES := \
 	source/row_any.o           \
 	source/row_common.o        \
 	source/row_gcc.o           \
+	source/row_mmi.o           \
 	source/row_msa.o           \
 	source/row_neon64.o        \
 	source/row_neon.o          \
@@ -49,6 +52,7 @@ LOCAL_OBJ_FILES := \
 	source/scale.o             \
 	source/scale_common.o      \
 	source/scale_gcc.o         \
+	source/scale_mmi.o         \
 	source/scale_msa.o         \
 	source/scale_neon64.o      \
 	source/scale_neon.o        \
diff --git a/source/compare_mmi.cc b/source/compare_mmi.cc
index 7018b1951..7640d9468 100644
--- a/source/compare_mmi.cc
+++ b/source/compare_mmi.cc
@@ -17,6 +17,7 @@ namespace libyuv {
 extern "C" {
 #endif
 
+// This module is for Mips MMI.
 #if !defined(LIBYUV_DISABLE_MMI) && defined(_MIPS_ARCH_LOONGSON3A)
 
 // Hakmem method for hamming distance.
@@ -113,7 +114,8 @@ uint32_t SumSquareError_MMI(const uint8_t* src_a,
 
   return sse;
 }
-#endif
+
+#endif  // !defined(LIBYUV_DISABLE_MMI) && defined(_MIPS_ARCH_LOONGSON3A)
 
 #ifdef __cplusplus
 }  // extern "C"
diff --git a/source/rotate_mmi.cc b/source/rotate_mmi.cc
index 435fda110..f8de60834 100644
--- a/source/rotate_mmi.cc
+++ b/source/rotate_mmi.cc
@@ -16,6 +16,7 @@ namespace libyuv {
 extern "C" {
 #endif
 
+// This module is for Mips MMI.
 #if !defined(LIBYUV_DISABLE_MMI) && defined(_MIPS_ARCH_LOONGSON3A)
 
 void TransposeWx8_MMI(const uint8_t* src,
@@ -282,7 +283,7 @@ void TransposeUVWx8_MMI(const uint8_t* src,
       : "memory");
 }
 
-#endif
+#endif  // !defined(LIBYUV_DISABLE_MMI) && defined(_MIPS_ARCH_LOONGSON3A)
 
 #ifdef __cplusplus
 }  // extern "C"
diff --git a/source/row_mmi.cc b/source/row_mmi.cc
index 6c2885973..dab801068 100644
--- a/source/row_mmi.cc
+++ b/source/row_mmi.cc
@@ -20,6 +20,9 @@ namespace libyuv {
 extern "C" {
 #endif
 
+// This module is for Mips MMI.
+#if !defined(LIBYUV_DISABLE_MMI) && defined(_MIPS_ARCH_LOONGSON3A)
+
 void RGB24ToARGBRow_MMI(const uint8_t* src_rgb24,
                         uint8_t* dst_argb,
                         int width) {
@@ -5966,6 +5969,8 @@ void ARGBCopyYToAlphaRow_MMI(const uint8_t* src, uint8_t* dst, int width) {
       : "memory");
 }
 
+#endif  // !defined(LIBYUV_DISABLE_MMI) && defined(_MIPS_ARCH_LOONGSON3A)
+
 #ifdef __cplusplus
 }  // extern "C"
 }  // namespace libyuv
diff --git a/source/scale_mmi.cc b/source/scale_mmi.cc
index 604397f70..4757d8997 100644
--- a/source/scale_mmi.cc
+++ b/source/scale_mmi.cc
@@ -23,6 +23,7 @@ namespace libyuv {
 extern "C" {
 #endif
 
+// This module is for Mips MMI.
 #if !defined(LIBYUV_DISABLE_MMI) && defined(_MIPS_ARCH_LOONGSON3A)
 
 // CPU agnostic row functions
@@ -1120,7 +1121,7 @@ void ScaleRowUp2_16_MMI(const uint16_t* src_ptr,
       : "memory");
 }
 
-#endif
+#endif  // !defined(LIBYUV_DISABLE_MMI) && defined(_MIPS_ARCH_LOONGSON3A)
 
 #ifdef __cplusplus
 }  // extern "C"