Switch to standard integer types in media/.

media/base/audio_buffer.h

Index: media/base/audio_buffer.h
diff --git a/media/base/audio_buffer.h b/media/base/audio_buffer.h
index bf8e4334912e78736dba4e3c1e6204beb6d6fec1..fb73c34cadb6875de21fd713446c75c7f724e861 100644
--- a/media/base/audio_buffer.h
+++ b/media/base/audio_buffer.h
@@ -50,7 +50,7 @@ class MEDIA_EXPORT AudioBuffer
                                              int channel_count,
                                              int sample_rate,
                                              int frame_count,
-                                             const uint8* const* data,
+                                             const uint8_t* const* data,
                                              const base::TimeDelta timestamp);
 
   // Create an AudioBuffer with |frame_count| frames. Buffer is allocated, but
@@ -86,13 +86,13 @@ class MEDIA_EXPORT AudioBuffer
 
   // Copy |frames_to_copy| frames into |dest|, |frames_to_copy| is the number of
   // frames to copy. The frames are converted from their source format into
-  // interleaved int32.
-  void ReadFramesInterleavedS32(int frames_to_copy, int32* dest);
+  // interleaved int32_t.
+  void ReadFramesInterleavedS32(int frames_to_copy, int32_t* dest);
 
   // Copy |frames_to_copy| frames into |dest|, |frames_to_copy| is the number of
   // frames to copy. The frames are converted from their source format into
-  // interleaved int16.
-  void ReadFramesInterleavedS16(int frames_to_copy, int16* dest);
+  // interleaved int16_t.
+  void ReadFramesInterleavedS16(int frames_to_copy, int16_t* dest);
 
   // Trim an AudioBuffer by removing |frames_to_trim| frames from the start.
   // Timestamp and duration are adjusted to reflect the fewer frames.
@@ -129,7 +129,7 @@ class MEDIA_EXPORT AudioBuffer
 
   // Access to the raw buffer for ffmpeg to write directly to. Data for planar
   // data is grouped by channel. There is only 1 entry for interleaved formats.
-  const std::vector<uint8*>& channel_data() const { return channel_data_; }
+  const std::vector<uint8_t*>& channel_data() const { return channel_data_; }
 
  private:
   friend class base::RefCountedThreadSafe<AudioBuffer>;
@@ -150,7 +150,7 @@ class MEDIA_EXPORT AudioBuffer
               int sample_rate,
               int frame_count,
               bool create_buffer,
-              const uint8* const* data,
+              const uint8_t* const* data,
               const base::TimeDelta timestamp);
 
   virtual ~AudioBuffer();
@@ -166,11 +166,11 @@ class MEDIA_EXPORT AudioBuffer
   base::TimeDelta duration_;
 
   // Contiguous block of channel data.
-  scoped_ptr<uint8, base::AlignedFreeDeleter> data_;
+  scoped_ptr<uint8_t, base::AlignedFreeDeleter> data_;
   size_t data_size_;
 
   // For planar data, points to each channels data.
-  std::vector<uint8*> channel_data_;
+  std::vector<uint8_t*> channel_data_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(AudioBuffer);
 };