ref: 23591322cfe8f9e88d150ff737e0773293012f32
parent: 16c0ec711c02062d10cf9ad53e1a4978792ecb43
author: James Zern <[email protected]>
date: Wed Aug 5 08:52:40 EDT 2015
third_party/libwebm: pull from upstream Changes: 2dec094 mkvparser: normalize UnserializeInt signature fixes a visual studio build warning Change-Id: Ifb99c8a46957ee135f8a6a639f19f2515c7526c3
--- a/third_party/libwebm/README.libvpx
+++ b/third_party/libwebm/README.libvpx
@@ -1,5 +1,5 @@
URL: https://chromium.googlesource.com/webm/libwebm
-Version: b6de61a5c0d441c91afb0785e3b26efd2f9e7337
+Version: 2dec09426ab62b794464cc9971bd135b4d313e65
License: BSD
License File: LICENSE.txt
--- a/third_party/libwebm/mkvparser.cpp
+++ b/third_party/libwebm/mkvparser.cpp
@@ -23,7 +23,7 @@
major = 1;
minor = 0;
build = 0;
- revision = 29;
+ revision = 30;
}
long long mkvparser::ReadUInt(IMkvReader* pReader, long long pos, long& len) {
@@ -219,8 +219,8 @@
return 0;
}
-long mkvparser::UnserializeInt(IMkvReader* pReader, long long pos, long size,
- long long& result) {
+long mkvparser::UnserializeInt(IMkvReader* pReader, long long pos,
+ long long size, long long& result) {
assert(pReader);
assert(pos >= 0);
assert(size > 0);
--- a/third_party/libwebm/mkvparser.hpp
+++ b/third_party/libwebm/mkvparser.hpp
@@ -32,7 +32,8 @@
long long UnserializeUInt(IMkvReader*, long long pos, long long size);
long UnserializeFloat(IMkvReader*, long long pos, long long size, double&);
-long UnserializeInt(IMkvReader*, long long pos, long len, long long& result);
+long UnserializeInt(IMkvReader*, long long pos, long long size,
+ long long& result);
long UnserializeString(IMkvReader*, long long pos, long long size, char*& str);