Switch to standard integer types in media/.

media/ffmpeg/ffmpeg_common.h

 // Copyright (c) 2012 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_FFMPEG_FFMPEG_COMMON_H_
 #define MEDIA_FFMPEG_FFMPEG_COMMON_H_
 
 // Used for FFmpeg error codes.
 #include <cerrno>
 
@@ skipping 57 matching lines @@
 inline void ScopedPtrAVFreeContext::operator()(void* x) const {
   AVCodecContext* codec_context = static_cast<AVCodecContext*>(x);
   avcodec_free_context(&codec_context);
 }
 
 inline void ScopedPtrAVFreeFrame::operator()(void* x) const {
   AVFrame* frame = static_cast<AVFrame*>(x);
   av_frame_free(&frame);
 }
 
-// Converts an int64 timestamp in |time_base| units to a base::TimeDelta.
+// Converts an int64_t timestamp in |time_base| units to a base::TimeDelta.
 // For example if |timestamp| equals 11025 and |time_base| equals {1, 44100}
 // then the return value will be a base::TimeDelta for 0.25 seconds since that
 // is how much time 11025/44100ths of a second represents.
 MEDIA_EXPORT base::TimeDelta ConvertFromTimeBase(const AVRational& time_base,
-                                                 int64 timestamp);
+                                                 int64_t timestamp);
 
-// Converts a base::TimeDelta into an int64 timestamp in |time_base| units.
+// Converts a base::TimeDelta into an int64_t timestamp in |time_base| units.
 // For example if |timestamp| is 0.5 seconds and |time_base| is {1, 44100}, then
 // the return value will be 22050 since that is how many 1/44100ths of a second
 // represent 0.5 seconds.
-MEDIA_EXPORT int64 ConvertToTimeBase(const AVRational& time_base,
-                                     const base::TimeDelta& timestamp);
+MEDIA_EXPORT int64_t ConvertToTimeBase(const AVRational& time_base,
+                                       const base::TimeDelta& timestamp);
 
 // Returns true if AVStream is successfully converted to a AudioDecoderConfig.
 // Returns false if conversion fails, in which case |config| is not modified.
 MEDIA_EXPORT bool AVStreamToAudioDecoderConfig(const AVStream* stream,
                                                AudioDecoderConfig* config);
 void AudioDecoderConfigToAVCodecContext(
     const AudioDecoderConfig& config,
     AVCodecContext* codec_context);
 
 // Returns true if AVStream is successfully converted to a VideoDecoderConfig.
@@ skipping 39 matching lines @@
 // date string. Otherwise returns fals and timeline_offset is unmodified.
 MEDIA_EXPORT bool FFmpegUTCDateToTime(const char* date_utc, base::Time* out);
 
 // Returns a 32-bit hash for the given codec name.  See the VerifyUmaCodecHashes
 // unit test for more information and code for generating the histogram XML.
 MEDIA_EXPORT int32_t HashCodecName(const char* codec_name);
 
 }  // namespace media
 
 #endif  // MEDIA_FFMPEG_FFMPEG_COMMON_H_