Skip to content

Commit

Permalink
Revert "mkvmuxer,Cluster::Size: make uint64 conversion explicit"
Browse files Browse the repository at this point in the history
This reverts commit 46b2005.

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
  • Loading branch information
jzern committed Jan 26, 2022
1 parent b8b2c0a commit ee0bab5
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions mkvmuxer/mkvmuxer.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down

0 comments on commit ee0bab5

Please sign in to comment.