Commit 23591322 authored by James Zern's avatar James Zern

third_party/libwebm: pull from upstream

Changes:
2dec094 mkvparser: normalize UnserializeInt signature

fixes a visual studio build warning

Change-Id: Ifb99c8a46957ee135f8a6a639f19f2515c7526c3
parent 16c0ec71
URL: https://chromium.googlesource.com/webm/libwebm
Version: b6de61a5c0d441c91afb0785e3b26efd2f9e7337
Version: 2dec09426ab62b794464cc9971bd135b4d313e65
License: BSD
License File: LICENSE.txt
......
......@@ -23,7 +23,7 @@ void mkvparser::GetVersion(int& major, int& minor, int& build, int& revision) {
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 @@ long mkvparser::UnserializeFloat(IMkvReader* pReader, long long pos,
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);
......
......@@ -32,7 +32,8 @@ long long ReadUInt(IMkvReader*, long long, long&);
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);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment