From 7b2450131c32e52aea8b779125ce987fde7a61d7 Mon Sep 17 00:00:00 2001
From: Vignesh Venkatasubramanian <vigneshv@google.com>
Date: Tue, 29 Apr 2014 00:35:56 -0700
Subject: [PATCH] clang-format re-run.

Re-running clang-format to take into account the recent change in it.
(https://gerrit.chromium.org/gerrit/#/c/69926/ )

Change-Id: Ie11afcaaf07a1967f65fd765f1a7c7112c85875a
---
 mkvmuxer.cpp    |  2 +-
 mkvmuxer.hpp    |  3 +--
 vttdemux.cc     | 12 ++++++------
 webvttparser.cc |  8 ++++----
 4 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/mkvmuxer.cpp b/mkvmuxer.cpp
index d245fbd..45167ea 100644
--- a/mkvmuxer.cpp
+++ b/mkvmuxer.cpp
@@ -2690,7 +2690,7 @@ int Segment::TestFrame(uint64 track_number, uint64 frame_timestamp_ns,
   // so this indicates a bug somewhere in our algorithm.
 
   if (frame_timecode < last_cluster_timecode)  // should never happen
-    return -1;                                 // error
+    return -1;
 
   // If the frame has a timestamp significantly larger than the last
   // cluster (in Matroska, cluster-relative timestamps are serialized
diff --git a/mkvmuxer.hpp b/mkvmuxer.hpp
index 3b0cf94..1c1c310 100644
--- a/mkvmuxer.hpp
+++ b/mkvmuxer.hpp
@@ -769,8 +769,7 @@ class Cluster {
   // sub-element but no reference time sub-elements (indicating that
   // it is considered a keyframe, per Matroska semantics).
   bool AddMetadata(const uint8* frame, uint64 length, uint64 track_number,
-                   uint64 timecode,   // timecode units (absolute)
-                   uint64 duration);  // timecode units
+                   uint64 timecode, uint64 duration);
 
   // Increments the size of the cluster's data in bytes.
   void AddPayloadSize(uint64 size);
diff --git a/vttdemux.cc b/vttdemux.cc
index 3835fce..17b45a9 100644
--- a/vttdemux.cc
+++ b/vttdemux.cc
@@ -25,7 +25,7 @@ using std::string;
 namespace vttdemux {
 
 typedef long long mkvtime_t;  // NOLINT
-typedef long long mkvpos_t;   // NOLINT
+typedef long long mkvpos_t;  // NOLINT
 typedef std::auto_ptr<mkvparser::Segment> segment_ptr_t;
 
 // WebVTT metadata tracks have a type (encoded in the CodecID for the track).
@@ -286,7 +286,7 @@ FrameParser::~FrameParser() {}
 
 int FrameParser::GetChar(char* c) {
   if (pos_ >= pos_end_)  // end-of-stream
-    return 1;            // per the semantics of libwebvtt::Reader::GetChar
+    return 1;  // per the semantics of libwebvtt::Reader::GetChar
 
   const mkvparser::Cluster* const cluster = block_group_->GetCluster();
   const mkvparser::Segment* const segment = cluster->m_pSegment;
@@ -321,7 +321,7 @@ ChapterAtomParser::~ChapterAtomParser() {}
 
 int ChapterAtomParser::GetChar(char* c) {
   if (str_ >= str_end_)  // end-of-stream
-    return 1;            // per the semantics of libwebvtt::Reader::GetChar
+    return 1;  // per the semantics of libwebvtt::Reader::GetChar
 
   *c = *str_++;  // consume this character in the stream
   return 0;
@@ -637,7 +637,7 @@ bool vttdemux::WriteChaptersFile(const metadata_map_t& m,
   const int edition_count = chapters->GetEditionCount();
 
   if (edition_count <= 0)  // weird
-    return true;           // nothing to do
+    return true;  // nothing to do
 
   if (edition_count > 1) {
     // TODO(matthewjheaney): figure what to do here
@@ -795,7 +795,7 @@ bool vttdemux::ProcessCluster(const metadata_map_t& m,
   const mkvparser::BlockEntry* block_entry;
 
   long result = c->GetFirst(block_entry);  // NOLINT
-  if (result < 0) {                        // error
+  if (result < 0) {
     printf("bad cluster (unable to get first block)\n");
     return false;
   }
@@ -826,7 +826,7 @@ bool vttdemux::ProcessBlockEntry(const metadata_map_t& m,
   const iter_t i = m.find(static_cast<metadata_map_t::key_type>(tn));
 
   if (i == m.end())  // not a metadata track
-    return true;     // nothing else to do
+    return true;  // nothing else to do
 
   if (block_entry->GetKind() != mkvparser::BlockEntry::kBlockGroup)
     return false;  // weird
diff --git a/webvttparser.cc b/webvttparser.cc
index 6d4d788..655252c 100644
--- a/webvttparser.cc
+++ b/webvttparser.cc
@@ -141,7 +141,7 @@ int Parser::Init() {
   if (e < 0)  // error
     return e;
 
-  if (e > 0)   // EOF
+  if (e > 0)  // EOF
     return 0;  // weird but valid
 
   if (!line.empty()) {
@@ -162,7 +162,7 @@ int Parser::Init() {
   if (e < 0)  // error
     return e;
 
-  if (e > 0)   // EOF
+  if (e > 0)  // EOF
     return 0;  // weird but we allow it
 
   if (!line.empty())
@@ -515,7 +515,7 @@ int Parser::ParseSettings(const std::string& line, std::string::size_type idx,
       const char c = line[idx];
 
       if (c == kNUL)  // end-of-line
-        return 0;     // success
+        return 0;  // success
 
       if (c != kSPACE && c != kTAB)
         break;
@@ -559,7 +559,7 @@ int Parser::ParseSettings(const std::string& line, std::string::size_type idx,
         break;
 
       if (c == ':')  // suspicious when part of VALUE
-        return -1;   // TODO(matthewjheaney): verify this behavior
+        return -1;  // TODO(matthewjheaney): verify this behavior
 
       s.value.push_back(c);