diff options
| author | Andreas Huber <andih@google.com> | 2010-09-09 14:21:19 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-09 14:21:19 -0700 |
| commit | f6b815409d91292f68295102a60f6320e8936f65 (patch) | |
| tree | 132f421ff361a48c18abfa38f2d8c64ff33cd72b | |
| parent | c4a43e25626e6323737e4933868b7786c9ae1c4f (diff) | |
| parent | 8986f62b30e494b68476ff8ef81acd4b1dd22674 (diff) | |
| download | frameworks_base-f6b815409d91292f68295102a60f6320e8936f65.zip frameworks_base-f6b815409d91292f68295102a60f6320e8936f65.tar.gz frameworks_base-f6b815409d91292f68295102a60f6320e8936f65.tar.bz2 | |
am 8986f62b: am f3de053c: Merge "Instead of asserting return a runtime error if the maximum sample size cannot be determined." into gingerbread
Merge commit '8986f62b30e494b68476ff8ef81acd4b1dd22674'
* commit '8986f62b30e494b68476ff8ef81acd4b1dd22674':
Instead of asserting return a runtime error if the maximum sample size cannot be determined.
| -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 |