Merge "ANDROID: Add simple fuzzing targets for video and video+audio encoding."
diff --git a/METADATA b/METADATA
index 2187c84..44ea270 100644
--- a/METADATA
+++ b/METADATA
@@ -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 @@
     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 @@
 
 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;
 }