commit 12f6dc34b4ca1a2d9dc4b616b48b247ad5556cbd
author Tom Finegan <tomfinegan@google.com> Wed Mar 16 21:14:26 2016 -0700
committer Tom Finegan <tomfinegan@google.com> Mon Mar 21 12:41:45 2016 -0700
tree 633aa935c0238cbc020d9cf31d9065db1f22725e
parent 0407360dcf522dcd96c9d1fd9fd8c1808a016177

Use <stdint.h> types instead of custom typedefs.

Change-Id: Ia43b81649a14d0509aef2119be7a0ea9be955201

sample_muxer_metadata.cc

diff --git a/sample_muxer_metadata.cc b/sample_muxer_metadata.cc
index 92fc3ff..cc871d4 100644
--- a/sample_muxer_metadata.cc
+++ b/sample_muxer_metadata.cc
@@ -33,7 +33,7 @@
   if (kind == kChapters)
     return LoadChapters(file);
 
-  uint64 track_num;
+  uint64_t track_num;
 
   if (!AddTrack(kind, &track_num)) {
     printf("Unable to add track for WebVTT file \"%s\"\n", file);
@@ -58,7 +58,7 @@
   return true;
 }
 
-bool SampleMuxerMetadata::Write(int64 time_ns) {
+bool SampleMuxerMetadata::Write(int64_t time_ns) {
   typedef cues_set_t::iterator iter_t;
 
   iter_t i = cues_set_.begin();
@@ -174,8 +174,8 @@
   const time_ms_t stop_time_ms = cue.stop_time.presentation();
 
   enum { kNsPerMs = 1000000 };
-  const uint64 start_time_ns = start_time_ms * kNsPerMs;
-  const uint64 stop_time_ns = stop_time_ms * kNsPerMs;
+  const uint64_t start_time_ns = start_time_ms * kNsPerMs;
+  const uint64_t stop_time_ns = stop_time_ms * kNsPerMs;
 
   chapter->set_time(*segment_, start_time_ns, stop_time_ns);
 
@@ -203,7 +203,7 @@
   return true;
 }
 
-bool SampleMuxerMetadata::AddTrack(Kind kind, uint64* track_num) {
+bool SampleMuxerMetadata::AddTrack(Kind kind, uint64_t* track_num) {
   *track_num = 0;
 
   // Track number value 0 means "let muxer choose track number"
@@ -252,7 +252,7 @@
 }
 
 bool SampleMuxerMetadata::Parse(const char* file, Kind /* kind */,
-                                uint64 track_num) {
+                                uint64_t track_num) {
   libwebvtt::VttReader r;
   int e = r.Open(file);
 
@@ -361,26 +361,26 @@
 
 bool SampleMuxerMetadata::SortableCue::Write(mkvmuxer::Segment* segment) const {
   // Cue start time expressed in milliseconds
-  const int64 start_ms = cue.start_time.presentation();
+  const int64_t start_ms = cue.start_time.presentation();
 
   // Cue start time expressed in nanoseconds (MKV time)
-  const int64 start_ns = start_ms * 1000000;
+  const int64_t start_ns = start_ms * 1000000;
 
   // Cue stop time expressed in milliseconds
-  const int64 stop_ms = cue.stop_time.presentation();
+  const int64_t stop_ms = cue.stop_time.presentation();
 
   // Cue stop time expressed in nanonseconds
-  const int64 stop_ns = stop_ms * 1000000;
+  const int64_t stop_ns = stop_ms * 1000000;
 
   // Metadata blocks always specify the block duration.
-  const int64 duration_ns = stop_ns - start_ns;
+  const int64_t duration_ns = stop_ns - start_ns;
 
   std::string frame;
   MakeFrame(cue, &frame);
 
-  typedef const uint8* data_t;
+  typedef const uint8_t* data_t;
   const data_t buf = reinterpret_cast<data_t>(frame.data());
-  const uint64 len = frame.length();
+  const uint64_t len = frame.length();
 
   mkvmuxer::Frame muxer_frame;
   if (!muxer_frame.Init(buf, len))