diff --git a/README.chromium b/README.chromium
index e28b5cf58..a1c4e3d3b 100644
--- a/README.chromium
+++ b/README.chromium
@@ -1,6 +1,6 @@
 Name: libyuv
 URL: http://code.google.com/p/libyuv/
-Version: 356
+Version: 357
 License: BSD
 License File: LICENSE
 
diff --git a/include/libyuv/version.h b/include/libyuv/version.h
index 41bbe277d..b17f5a278 100644
--- a/include/libyuv/version.h
+++ b/include/libyuv/version.h
@@ -11,6 +11,6 @@
 #ifndef INCLUDE_LIBYUV_VERSION_H_  // NOLINT
 #define INCLUDE_LIBYUV_VERSION_H_
 
-#define LIBYUV_VERSION 356
+#define LIBYUV_VERSION 357
 
 #endif  // INCLUDE_LIBYUV_VERSION_H_  NOLINT
diff --git a/source/convert_argb.cc b/source/convert_argb.cc
index a6a302542..61d024195 100644
--- a/source/convert_argb.cc
+++ b/source/convert_argb.cc
@@ -55,8 +55,8 @@ int I444ToARGB(const uint8* src_y, int src_stride_y,
   if (!src_y || !src_u || !src_v ||
       !dst_argb ||
       width <= 0 || height == 0) {
-     return -1;
-   }
+    return -1;
+  }
   // Negative height means invert the image.
   if (height < 0) {
     height = -height;
diff --git a/source/row.h b/source/row.h
index dcd8b26e2..134dcb8b3 100644
--- a/source/row.h
+++ b/source/row.h
@@ -37,9 +37,9 @@ extern "C" {
 #define HAS_ABGRTOARGBROW_SSSE3
 #define HAS_ABGRTOUVROW_SSSE3
 #define HAS_ABGRTOYROW_SSSE3
-// TODO: #define HAS_RGBATOARGBROW_SSSE3
-// TODO: #define HAS_RGBATOUVROW_SSSE3
-// TODO: #define HAS_RGBATOYROW_SSSE3
+// TODO(FBARCHARD): #define HAS_RGBATOARGBROW_SSSE3
+// TODO(FBARCHARD): #define HAS_RGBATOUVROW_SSSE3
+// TODO(FBARCHARD): #define HAS_RGBATOYROW_SSSE3
 #define HAS_ARGBTORGBAROW_SSSE3
 #define HAS_ARGB1555TOARGBROW_SSE2
 #define HAS_ARGB4444TOARGBROW_SSE2
@@ -61,7 +61,7 @@ extern "C" {
 #define HAS_I422TOARGBROW_SSSE3
 #define HAS_I422TOBGRAROW_SSSE3
 #define HAS_I422TOABGRROW_SSSE3
-// TODO: #define HAS_I422TORGBAROW_SSSE3
+// TODO(FBARCHARD): #define HAS_I422TORGBAROW_SSSE3
 #define HAS_I444TOARGBROW_SSSE3
 #define HAS_I411TOARGBROW_SSSE3
 #define HAS_I400TOARGBROW_SSE2
@@ -115,7 +115,7 @@ extern "C" {
 #define HAS_I422TOARGBROW_NEON
 #define HAS_I422TOBGRAROW_NEON
 #define HAS_I422TOABGRROW_NEON
-// TODO: #define HAS_I422TORGBAROW_NEON
+// TODO(FBARCHARD): #define HAS_I422TORGBAROW_NEON
 #endif
 
 #if defined(_MSC_VER) && !defined(__CLR_VER)
diff --git a/source/row_common.cc b/source/row_common.cc
index e6b1204bf..03b1c1074 100644
--- a/source/row_common.cc
+++ b/source/row_common.cc
@@ -949,13 +949,13 @@ Y2NY(NV12ToARGBRow_Any_SSSE3, NV12ToARGBRow_Unaligned_SSSE3, NV12ToARGBRow_C, 0)
 Y2NY(NV21ToARGBRow_Any_SSSE3, NV21ToARGBRow_Unaligned_SSSE3, NV21ToARGBRow_C, 0)
 YANY(I422ToBGRARow_Any_SSSE3, I422ToBGRARow_Unaligned_SSSE3, I422ToBGRARow_C, 1)
 YANY(I422ToABGRRow_Any_SSSE3, I422ToABGRRow_Unaligned_SSSE3, I422ToABGRRow_C, 1)
-// TODO: YANY(I422ToRGBARow_Any_SSSE3, I422ToRGBARow_Unaligned_SSSE3, I422ToRGBARow_C, 1)
+// TODO(fbarchard): NOLINT YANY(I422ToRGBARow_Any_SSSE3, I422ToRGBARow_Unaligned_SSSE3, I422ToRGBARow_C, 1)
 #endif
 #if defined(HAS_I422TOARGBROW_NEON)
 YANY(I422ToARGBRow_Any_NEON, I422ToARGBRow_NEON, I422ToARGBRow_C, 1)
 YANY(I422ToBGRARow_Any_NEON, I422ToBGRARow_NEON, I422ToBGRARow_C, 1)
 YANY(I422ToABGRRow_Any_NEON, I422ToABGRRow_NEON, I422ToABGRRow_C, 1)
-// TODO: YANY(I422ToRGBARow_Any_NEON, I422ToRGBARow_NEON, I422ToRGBARow_C, 1)
+// TODO(fbarchard): NOLINT YANY(I422ToRGBARow_Any_NEON, I422ToRGBARow_NEON, I422ToRGBARow_C, 1)
 #endif
 #undef YANY
 
@@ -987,7 +987,7 @@ RGBANY(ARGBToARGB4444Row_Any_SSE2, ARGBToARGB4444Row_SSE2, 2)
 YANY(ARGBToYRow_Any_SSSE3, ARGBToYRow_Unaligned_SSSE3, 4)
 YANY(BGRAToYRow_Any_SSSE3, BGRAToYRow_Unaligned_SSSE3, 4)
 YANY(ABGRToYRow_Any_SSSE3, ABGRToYRow_Unaligned_SSSE3, 4)
-// TODO: YANY(RGBAToYRow_Any_SSSE3, RGBAToYRow_Unaligned_SSSE3, 4)
+// TODO(fbarchard): YANY(RGBAToYRow_Any_SSSE3, RGBAToYRow_Unaligned_SSSE3, 4)
 YANY(YUY2ToYRow_Any_SSE2, YUY2ToYRow_Unaligned_SSE2, 2)
 YANY(UYVYToYRow_Any_SSE2, UYVYToYRow_Unaligned_SSE2, 2)
 #undef YANY
@@ -1006,7 +1006,7 @@ YANY(UYVYToYRow_Any_SSE2, UYVYToYRow_Unaligned_SSE2, 2)
 UVANY(ARGBToUVRow_Any_SSSE3, ARGBToUVRow_Unaligned_SSSE3, ARGBToUVRow_C, 4)
 UVANY(BGRAToUVRow_Any_SSSE3, BGRAToUVRow_Unaligned_SSSE3, BGRAToUVRow_C, 4)
 UVANY(ABGRToUVRow_Any_SSSE3, ABGRToUVRow_Unaligned_SSSE3, ABGRToUVRow_C, 4)
-// TODO: UVANY(RGBAToUVRow_Any_SSSE3, RGBAToUVRow_Unaligned_SSSE3, RGBAToUVRow_C, 4)
+// TODO(fbarchard): NOLINT UVANY(RGBAToUVRow_Any_SSSE3, RGBAToUVRow_Unaligned_SSSE3, RGBAToUVRow_C, 4)
 UVANY(YUY2ToUVRow_Any_SSE2, YUY2ToUVRow_Unaligned_SSE2, YUY2ToUVRow_C, 2)
 UVANY(UYVYToUVRow_Any_SSE2, UYVYToUVRow_Unaligned_SSE2, UYVYToUVRow_C, 2)
 #undef UVANY
diff --git a/source/scale_argb.cc b/source/scale_argb.cc
index 48e48adc7..8887018a8 100644
--- a/source/scale_argb.cc
+++ b/source/scale_argb.cc
@@ -37,7 +37,8 @@ extern "C" {
 // Reads 8 pixels, throws half away and writes 4 even pixels (0, 2, 4, 6)
 // Alignment requirement: src_ptr 16 byte aligned, dst_ptr 16 byte aligned.
 __declspec(naked) __declspec(align(16))
-static void ScaleARGBRowDown2_SSE2(const uint8* src_ptr, ptrdiff_t /* src_stride */,
+static void ScaleARGBRowDown2_SSE2(const uint8* src_ptr,
+                                   ptrdiff_t /* src_stride */,
                                    uint8* dst_ptr, int dst_width) {
   __asm {
     mov        eax, [esp + 4]        // src_ptr
@@ -63,7 +64,8 @@ static void ScaleARGBRowDown2_SSE2(const uint8* src_ptr, ptrdiff_t /* src_stride
 // Blends 8x2 rectangle to 4x1.
 // Alignment requirement: src_ptr 16 byte aligned, dst_ptr 16 byte aligned.
 __declspec(naked) __declspec(align(16))
-static void ScaleARGBRowDown2Int_SSE2(const uint8* src_ptr, ptrdiff_t src_stride,
+static void ScaleARGBRowDown2Int_SSE2(const uint8* src_ptr,
+                                      ptrdiff_t src_stride,
                                       uint8* dst_ptr, int dst_width) {
   __asm {
     push       esi
@@ -137,7 +139,8 @@ void ScaleARGBRowDownEven_SSE2(const uint8* src_ptr, ptrdiff_t src_stride,
 // Blends four 2x2 to 4x1.
 // Alignment requirement: dst_ptr 16 byte aligned.
 __declspec(naked) __declspec(align(16))
-static void ScaleARGBRowDownEvenInt_SSE2(const uint8* src_ptr, ptrdiff_t src_stride,
+static void ScaleARGBRowDownEvenInt_SSE2(const uint8* src_ptr,
+                                         ptrdiff_t src_stride,
                                          int src_stepx,
                                          uint8* dst_ptr, int dst_width) {
   __asm {
diff --git a/unit_test/version_test.cc b/unit_test/version_test.cc
index a0a8daf76..dffee2dab 100644
--- a/unit_test/version_test.cc
+++ b/unit_test/version_test.cc
@@ -30,7 +30,7 @@ TEST_F(libyuvTest, TestVersion) {
   } else {
     ver = LIBYUV_SVNREVISION;
   }
-  int svn_revision = atoi(ver);
+  int svn_revision = atoi(ver);  // NOLINT
   printf("LIBYUV_SVNREVISION %d\n", svn_revision);
   EXPECT_NEAR(LIBYUV_VERSION, svn_revision, 3);  // Allow version to be close.
   if (LIBYUV_VERSION != svn_revision) {