Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am f3de053c: Merge "Instead of asserting return a runtime error if the maximum sample size cannot be determined." into gingerbread

Browse Source 
Merge commit 'f3de053c0a525f85f763ab9b8781ae95ef3e930e' into gingerbread-plus-aosp

* commit 'f3de053c0a525f85f763ab9b8781ae95ef3e930e':
  Instead of asserting return a runtime error if the maximum sample size cannot be determined.
This commit is contained in:
Andreas Huber
2010-09-09 10:15:33 -07:00
committed by Android Git Automerger
parent e19df3dca1 f3de053c0a
commit 8986f62b30
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
media/libstagefright/MPEG4Extractor.cpp
View File

@@ -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