commit 4ec72fb10684276b048d5b3a6ba7a88d43b06411
author Wei Jia <wjia@google.com> Thu Aug 20 01:25:58 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Aug 20 01:25:58 2015 +0000
tree bd85ef78b8130fdd7c809d009e753386bc4e7308
parent e68e4ad7f2ecf45cd7c28c1192eab2059b477dd3
parent 9dbb32694529ff1dd285c5f2fad497ed937a5c44

am 9dbb3269: am 8a9c5a1d: am 4a94e3b4: am 217c6ceb: Merge commit \'efc44fee\' into HEAD

* commit '9dbb32694529ff1dd285c5f2fad497ed937a5c44':
  Disable bilinear_predict4x4_neon

libwebm/mkvparser.cpp

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