commit 485fb67b324aec5298765e899dc054459d3946e5
author James Zern <jzern@google.com> Tue Nov 24 23:40:20 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Nov 24 23:40:20 2020 +0000
tree dd39b2baaa74673bdb07bfbde17b5e1903659efa
parent 46b20057cfc24437fbe8987e0b70e0c4c8ecac75
parent 97f8074dc9cc5ca0263325c16340ff0f4fcfc212

Merge "mkvmuxer: Keep Segment in a good state when frame writes fail"

mkvmuxer/mkvmuxer.cc

diff --git a/mkvmuxer/mkvmuxer.cc b/mkvmuxer/mkvmuxer.cc
index 5926a15..499fbe6 100644
--- a/mkvmuxer/mkvmuxer.cc
+++ b/mkvmuxer/mkvmuxer.cc
@@ -2622,7 +2622,8 @@
 
 uint64_t Cluster::Size() const {
   const uint64_t element_size =
-      EbmlMasterElementSize(libwebm::kMkvCluster, 0xFFFFFFFFFFFFFFFFULL) +
+      EbmlMasterElementSize(static_cast<uint64_t>(libwebm::kMkvCluster),
+                            uint64_t{0xFFFFFFFFFFFFFFFFU}) +
       payload_size_;
   return element_size;
 }