Merge "MatroskaExtractor: handle parse error." into pi-dev

am: aa60151aa7

Change-Id: Ibd2a951787c66d0d1f73d931c1650012f1298544

media/extractors/mkv/MatroskaExtractor.cpp

@@ -360,7 +360,15 @@ void BlockIterator::advance_l() {
 
             res = mCluster->Parse(pos, len);
             ALOGV("Parse (2) returned %ld", res);
-            CHECK_GE(res, 0);
+
+            if (res < 0) {
+                // I/O error
+
+                ALOGE("Cluster::Parse returned result %ld", res);
+
+                mCluster = NULL;
+                break;
+            }
 
             mBlockEntryIndex = 0;
             continue;