diff options
| author | Andreas Huber <andih@google.com> | 2010-09-09 10:10:15 -0700 |
|---|---|---|
| committer | Andreas Huber <andih@google.com> | 2010-09-09 10:10:15 -0700 |
| commit | d7f2225e7455f5e0da32f409a528ced283631c5d (patch) | |
| tree | f8a6e94144778a2a928ba157abe79a1854189fa4 /media/libstagefright | |
| parent | a063cd6478254bba3290576ae5556abf469d6535 (diff) | |
| download | frameworks_base-d7f2225e7455f5e0da32f409a528ced283631c5d.zip frameworks_base-d7f2225e7455f5e0da32f409a528ced283631c5d.tar.gz frameworks_base-d7f2225e7455f5e0da32f409a528ced283631c5d.tar.bz2 | |
Instead of asserting return a runtime error if the maximum sample size cannot be determined.
Change-Id: Icf17ed04323f5415e0f9f1e4fd9f19ca60ce15ac
related-to-bug: 2602446
Diffstat (limited to 'media/libstagefright')
| -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 |