Minor formatting changes from libvpx

Change-Id: Id3cf866b147967b36f1c62e08b4a1adfb837c34c

aom_dsp/mips/inv_txfm_dspr2.h

@@ -31,8 +31,7 @@ extern "C" {
     int dct_cost_rounding = DCT_CONST_ROUNDING;                                \
     int in = input;                                                            \
                                                                                \
-    __asm__ __volatile__(/* out = dct_const_round_shift(input_dc *             \
-                            cospi_16_64); */                                   \
+    __asm__ __volatile__(/* out = dct_const_round_shift(dc *  cospi_16_64); */ \
                          "mtlo     %[dct_cost_rounding],   $ac1              " \
                          "                \n\t"                                \
                          "mthi     $zero,                  $ac1              " \

aom_scale/generic/aom_scale.c

@@ -258,9 +258,7 @@ static void Scale2D(
   int ratio_scalable = 1;
   int interpolation = 0;
 
-  unsigned char *source_base; /* = (unsigned char *) ((source_pitch >= 0) ?
-                                 source : (source + ((source_height-1) *
-                                 source_pitch))); */
+  unsigned char *source_base;
   unsigned char *line_src;
 
   source_base = (unsigned char *)source;

third_party/googletest/src/src/gtest-all.cc

@@ -6612,9 +6612,11 @@ GTEST_DEFINE_string_(
 
 namespace internal {
 
+# if !GTEST_OS_WINDOWS
 // Valid only for fast death tests. Indicates the code is running in the
 // child process of a fast style death test.
 static bool g_in_fast_death_test_child = false;
+# endif  // !GTEST_OS_WINDOWS
 
 // Returns a Boolean value indicating whether the caller is currently
 // executing in the context of the death test child process.  Tools such as