summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Zern <jzern@google.com>2020-07-08 12:59:54 -0700
committerJames Zern <jzern@google.com>2020-11-23 19:49:02 -0800
commit46b20057cfc24437fbe8987e0b70e0c4c8ecac75 (patch)
tree39ca58473d0c469cedbe9465e7b1fc6f9f485073
parent11cae244cc06c1295bffa9861c610dcde3b9da18 (diff)
downloadlibwebm-46b20057cfc24437fbe8987e0b70e0c4c8ecac75.tar.gz
mkvmuxer,Cluster::Size: make uint64 conversion explicit
PiperOrigin-RevId: 314246132 Change-Id: I92a5a7e46cfde7c7691f90856bd962b606529036
-rw-r--r--mkvmuxer/mkvmuxer.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/mkvmuxer/mkvmuxer.cc b/mkvmuxer/mkvmuxer.cc
index 5120312..be4c650 100644
--- a/mkvmuxer/mkvmuxer.cc
+++ b/mkvmuxer/mkvmuxer.cc
@@ -2622,7 +2622,8 @@ bool Cluster::Finalize(bool set_last_frame_duration, uint64_t duration) {
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;
}