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 | 31d2a4b01517a5e5d923d066269be49207b2c805 (patch) | |
| tree | e8cb4d091f17d034a01be243e9c3ec6371b7e4e4 /media | |
| parent | 4c73f1f95838a9cc86ff7d3beb7388f98eee562a (diff) | |
| parent | 49110ce0ed95918c85eebe6e09e900b905b37e23 (diff) | |
| download | frameworks_av-31d2a4b01517a5e5d923d066269be49207b2c805.zip frameworks_av-31d2a4b01517a5e5d923d066269be49207b2c805.tar.gz frameworks_av-31d2a4b01517a5e5d923d066269be49207b2c805.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 |