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

Commit 4f25d033 authored by Andreas Huber's avatar Andreas Huber Committed by Android Git Automerger
Browse files

am 261aaa16: Merge "Properly skip the \'skip\' chunk in mpeg4 files." into gingerbread 

Merge commit '261aaa16' into gingerbread-plus-aosp

* commit '261aaa16':
  Properly skip the 'skip' chunk in mpeg4 files.
parents d49d4031 261aaa16

media/libstagefright/MPEG4Extractor.cpp

+0 −1
Original line number Diff line number Diff line
@@ -492,7 +492,6 @@ status_t MPEG4Extractor::parseChunk(off_t *offset, int depth) { 
        case FOURCC('m', 'o', 'o', 'f'):

        case FOURCC('t', 'r', 'a', 'f'):

        case FOURCC('m', 'f', 'r', 'a'):

        case FOURCC('s', 'k', 'i' ,'p'):

        case FOURCC('u', 'd', 't', 'a'):

        case FOURCC('i', 'l', 's', 't'):

        {