diff options
| author | James Zern <jzern@google.com> | 2022-01-25 17:19:00 -0800 |
|---|---|---|
| committer | James Zern <jzern@google.com> | 2022-01-25 17:20:42 -0800 |
| commit | ee0bab576c338c9807249b99588e352b7268cb62 (patch) | |
| tree | 2025567178c9b0b89ee72428f7fbc3613e3b1515 | |
| parent | b8b2c0a87faaf00e31f4ce44be86f95789fbbe46 (diff) | |
| download | libwebm-ee0bab576c338c9807249b99588e352b7268cb62.tar.gz | |
Revert "mkvmuxer,Cluster::Size: make uint64 conversion explicit"
This reverts commit 46b20057cfc24437fbe8987e0b70e0c4c8ecac75.
The conversion results in a warning with Xcode. The original code was
correct given mkvmuxer::uint64 is defined as unsigned long long
Change-Id: I0e5a45c1df85ca59267ab444b386e44442a099ef
| -rw-r--r-- | mkvmuxer/mkvmuxer.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/mkvmuxer/mkvmuxer.cc b/mkvmuxer/mkvmuxer.cc index 24c2888..ae36531 100644 --- a/mkvmuxer/mkvmuxer.cc +++ b/mkvmuxer/mkvmuxer.cc @@ -2622,8 +2622,7 @@ bool Cluster::Finalize(bool set_last_frame_duration, uint64_t duration) { uint64_t Cluster::Size() const { const uint64_t element_size = - EbmlMasterElementSize(static_cast<uint64_t>(libwebm::kMkvCluster), - uint64_t{0xFFFFFFFFFFFFFFFFU}) + + EbmlMasterElementSize(libwebm::kMkvCluster, 0xFFFFFFFFFFFFFFFFULL) + payload_size_; return element_size; } |