Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8986f62b authored by Andreas Huber's avatar Andreas Huber Committed by Android Git Automerger
Browse files

am f3de053c: Merge "Instead of asserting return a runtime error if the maximum... 

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

Merge commit 'f3de053c' into gingerbread-plus-aosp

* commit 'f3de053c':
  Instead of asserting return a runtime error if the maximum sample size cannot be determined.
parents e19df3dc f3de053c

media/libstagefright/MPEG4Extractor.cpp

+5 −1
Original line number Diff line number Diff line
@@ -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