generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

third_party/libwebm: pull from upstream

Browse Source 
Changes:
2dec094 mkvparser: normalize UnserializeInt signature

fixes a visual studio build warning

Change-Id: Ifb99c8a46957ee135f8a6a639f19f2515c7526c3
This commit is contained in:
James Zern 2015-08-05 12:52:40 -07:00
parent 16c0ec711c
commit 23591322cf
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
third_party/libwebm/README.libvpx vendored
View File

@ -1,5 +1,5 @@
URL: https://chromium.googlesource.com/webm/libwebm
Version: b6de61a5c0d441c91afb0785e3b26efd2f9e7337
Version: 2dec09426ab62b794464cc9971bd135b4d313e65
License: BSD
License File: LICENSE.txt

6
third_party/libwebm/mkvparser.cpp vendored
View File

@ -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);

3
third_party/libwebm/mkvparser.hpp vendored
View File

@ -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);