diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-12-02 02:04:13 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-02 02:04:13 +0000 |
| commit | c52e98a9c152ffabc3f4dfd61607cb1900fa0746 (patch) | |
| tree | 90a80f4ffcedbb9649123a373c334be4a196bd06 | |
| parent | 28091ebfbff23db2d4a399343c6bfedcb512416a (diff) | |
| parent | 1a5a14f484bb3f6e943fa6135da7b646dcc2364f (diff) | |
| download | libwebm-c52e98a9c152ffabc3f4dfd61607cb1900fa0746.tar.gz | |
Merge "Upgrade libwebm to 485fb67b324aec5298765e899dc054459d3946e5" am: 0428151ec8 am: 1a5a14f484
Original change: https://android-review.googlesource.com/c/platform/external/libwebm/+/1510523
Change-Id: I0eea8902b3e0126ebd8c817d2a924f637442c0bf
| -rw-r--r-- | METADATA | 12 | ||||
| -rw-r--r-- | mkvmuxer/mkvmuxer.cc | 3 |
2 files changed, 9 insertions, 6 deletions
@@ -1,7 +1,5 @@ name: "libwebm" -description: - "libwebm is a library to read and write Matroska (MKV) and WebM files." - +description: "libwebm is a library to read and write Matroska (MKV) and WebM files." third_party { url { type: HOMEPAGE @@ -11,7 +9,11 @@ third_party { type: GIT value: "https://chromium.googlesource.com/webm/libwebm" } - version: "11cae244cc06c1295bffa9861c610dcde3b9da18" - last_upgrade_date { year: 2020 month: 10 day: 7 } + version: "485fb67b324aec5298765e899dc054459d3946e5" license_type: NOTICE + last_upgrade_date { + year: 2020 + month: 11 + day: 24 + } } 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 @@ 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; } |