Switch to standard integer types in media/.

media/filters/ffmpeg_aac_bitstream_converter.h

 // Copyright 2014 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.
 
 #ifndef MEDIA_FILTERS_FFMPEG_AAC_BITSTREAM_CONVERTER_H_
 #define MEDIA_FILTERS_FFMPEG_AAC_BITSTREAM_CONVERTER_H_
 
-#include "base/basictypes.h"
+#include <stdint.h>
+
+#include "base/macros.h"
+
 #include "media/base/media_export.h"
 #include "media/filters/ffmpeg_bitstream_converter.h"
 
 // Forward declarations for FFmpeg datatypes used.
 struct AVCodecContext;
 struct AVPacket;
 
 namespace media {
 
 // Bitstream converter that adds ADTS headers to AAC frames.
@@ skipping 25 matching lines @@
   int sample_rate_index_;
   int channel_configuration_;
   int frame_length_;
 
   DISALLOW_COPY_AND_ASSIGN(FFmpegAACBitstreamConverter);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_FILTERS_FFMPEG_AAC_BITSTREAM_CONVERTER_H_