summaryrefslogtreecommitdiff
path: root/third_party
diff options
context:
space:
mode:
authorJames Zern <jzern@google.com>2022-01-25 20:06:59 -0800
committerJames Zern <jzern@google.com>2022-01-25 20:06:59 -0800
commit395732f679e3f7842f5b2094e3a91de036f85708 (patch)
tree07419a0261f68763120e5e61fb508811807ea492 /third_party
parent51415c4076578d3cbc32fcd0d683161c3e887814 (diff)
downloadlibvpx-395732f679e3f7842f5b2094e3a91de036f85708.tar
libvpx-395732f679e3f7842f5b2094e3a91de036f85708.tar.gz
libvpx-395732f679e3f7842f5b2094e3a91de036f85708.tar.bz2
libvpx-395732f679e3f7842f5b2094e3a91de036f85708.zip
libwebm: update to libwebm-1.0.0.28-28-gee0bab5
https://chromium.googlesource.com/webm/libwebm/+log/206d268d4d8066e5a37c49025325b80c95c771dd..ee0bab576c338c9807249b99588e352b7268cb62 only one commit affects this snapshot: ee0bab5 Revert "mkvmuxer,Cluster::Size: make uint64 conversion explicit" Change-Id: Ib1f21fc5589098af346d110ff88c94bb1ba0a027
Diffstat (limited to 'third_party')
-rw-r--r--third_party/libwebm/README.libvpx2
-rw-r--r--third_party/libwebm/mkvmuxer/mkvmuxer.cc3
2 files changed, 2 insertions, 3 deletions
diff --git a/third_party/libwebm/README.libvpx b/third_party/libwebm/README.libvpx
index 5cc0a8370..325604cc6 100644
--- a/third_party/libwebm/README.libvpx
+++ b/third_party/libwebm/README.libvpx
@@ -1,5 +1,5 @@
URL: https://chromium.googlesource.com/webm/libwebm
-Version: 206d268d4d8066e5a37c49025325b80c95c771dd
+Version: ee0bab576c338c9807249b99588e352b7268cb62
License: BSD
License File: LICENSE.txt
diff --git a/third_party/libwebm/mkvmuxer/mkvmuxer.cc b/third_party/libwebm/mkvmuxer/mkvmuxer.cc
index 24c288863..ae3653143 100644
--- a/third_party/libwebm/mkvmuxer/mkvmuxer.cc
+++ b/third_party/libwebm/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;
}