| commit | c1dac2a28d9609d1cca8a06ecf4cebd1dcc54dcd | [log] [tgz] |
|---|---|---|
| author | Conley Owens <cco3@android.com> | Wed Mar 18 23:49:42 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Mar 18 23:49:42 2015 +0000 |
| tree | 48cb567c4da9d416c3d14a5308feb563669b04d2 | |
| parent | fc1f97bc051863f9c2ec41d749ce5b4513b9f0fc [diff] | |
| parent | 16f9a4cb3024b600733eafaf841f76ac70ba881a [diff] |
am 16f9a4cb: Merge "Add MODULE_LICENSE" * commit '16f9a4cb3024b600733eafaf841f76ac70ba881a': Add MODULE_LICENSE
diff --git a/libwebm/mkvparser.cpp b/libwebm/mkvparser.cpp index f7a34c1..7501b9f 100644 --- a/libwebm/mkvparser.cpp +++ b/libwebm/mkvparser.cpp
@@ -4133,7 +4133,7 @@ long long val; status = UnserializeInt(pReader, pos, size, val); - if (val < 0) // error + if (status < 0) // error return status; m_uid = static_cast<unsigned long long>(val);