diff options
| author | Andreas Huber <andih@google.com> | 2010-09-09 10:13:26 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-09-09 10:13:26 -0700 |
| commit | f3de053c0a525f85f763ab9b8781ae95ef3e930e (patch) | |
| tree | 4f1998bd5fa8936c22eed803422bf8976e0a8141 /media | |
| parent | 5c43a7af7b9530016b922ddec0401ab9199cd595 (diff) | |
| parent | d7f2225e7455f5e0da32f409a528ced283631c5d (diff) | |
| download | frameworks_base-f3de053c0a525f85f763ab9b8781ae95ef3e930e.zip frameworks_base-f3de053c0a525f85f763ab9b8781ae95ef3e930e.tar.gz frameworks_base-f3de053c0a525f85f763ab9b8781ae95ef3e930e.tar.bz2 | |
Merge "Instead of asserting return a runtime error if the maximum sample size cannot be determined." into gingerbread
Diffstat (limited to 'media')
| -rw-r--r-- | media/libstagefright/MPEG4Extractor.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/media/libstagefright/MPEG4Extractor.cpp b/media/libstagefright/MPEG4Extractor.cpp index ba90407..4bbc251 100644 --- a/media/libstagefright/MPEG4Extractor.cpp +++ b/media/libstagefright/MPEG4Extractor.cpp @@ -872,7 +872,11 @@ status_t MPEG4Extractor::parseChunk(off_t *offset, int depth) { } size_t max_size; - CHECK_EQ(mLastTrack->sampleTable->getMaxSampleSize(&max_size), OK); + err = mLastTrack->sampleTable->getMaxSampleSize(&max_size); + + if (err != OK) { + return err; + } // Assume that a given buffer only contains at most 10 fragments, // each fragment originally prefixed with a 2 byte length will |