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

Commit 261aaa16 authored by Andreas Huber's avatar Andreas Huber Committed by Android (Google) Code Review
Browse files

Merge "Properly skip the 'skip' chunk in mpeg4 files." into gingerbread

parents 9fbf00cb 765b8aa8
Loading
Loading
Loading
Loading
+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'):
        {