commit 41f2c47c0019b2a979ebe79241c5eb6ce14c0a3f
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Sep 14 21:58:39 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Sep 14 21:58:40 2016 +0000
tree ec3eac70d46bdb6f467614e3ca647de25ba3390a
parent bbf10d39d77c57faebb57595985537f27f37441d
parent 6db5763b0cc771278d3ee8ef1bcad945d6d2c430

Merge "Don't CHECK if the source can't be started" into nyc-mr1-dev

media/libstagefright/NuMediaExtractor.cpp

diff --git a/media/libstagefright/NuMediaExtractor.cpp b/media/libstagefright/NuMediaExtractor.cpp
index a669dca..276d731 100644
--- a/media/libstagefright/NuMediaExtractor.cpp
+++ b/media/libstagefright/NuMediaExtractor.cpp
@@ -305,7 +305,10 @@
 
     sp<IMediaSource> source = mImpl->getTrack(index);
 
-    CHECK_EQ((status_t)OK, source->start());
+    status_t ret = source->start();
+    if (ret != OK) {
+        return ret;
+    }
 
     mSelectedTracks.push();
     TrackInfo *info = &mSelectedTracks.editItemAt(mSelectedTracks.size() - 1);