Switch to standard integer types in media/, take 2.

media/filters/vp9_parser.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
 // This file contains an implementation of a VP9 bitstream parser.
 
 #include "media/filters/vp9_parser.h"
 
 #include <algorithm>
 
 #include "base/logging.h"
+#include "base/macros.h"
 #include "base/numerics/safe_conversions.h"
 
 namespace {
 
 const int kMaxLoopFilterLevel = 63;
 
 // Helper function for Vp9Parser::ReadTiles. Defined as get_min_log2_tile_cols
 // in spec.
 int GetMinLog2TileCols(int sb64_cols) {
   const int kMaxTileWidthB64 = 64;
@@ skipping 660 matching lines @@
               CLAMP_LF(level + loop_filter_.ref_deltas[type] * scale +
                        loop_filter_.mode_deltas[mode] * scale);
         }
       }
     }
   }
 }
 #undef CLAMP_LF
 
 }  // namespace media