diff options
| author | 2010-08-06 18:54:26 -0700 | |
|---|---|---|
| committer | 2010-08-06 18:54:26 -0700 | |
| commit | 4f25d03382ca01a00c6f0e0967c5edf302f62b55 (patch) | |
| tree | 14b50f9f32157a9583e7d47f415cb28db49765bf | |
| parent | d49d4031d654398904d5af30c488a3b32b176122 (diff) | |
| parent | 261aaa16a2f469d7f3d3b56f1a45432460ee4dba (diff) | |
am 261aaa16: Merge "Properly skip the \'skip\' chunk in mpeg4 files." into gingerbread
Merge commit '261aaa16a2f469d7f3d3b56f1a45432460ee4dba' into gingerbread-plus-aosp
* commit '261aaa16a2f469d7f3d3b56f1a45432460ee4dba':
Properly skip the 'skip' chunk in mpeg4 files.
| -rw-r--r-- | media/libstagefright/MPEG4Extractor.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/media/libstagefright/MPEG4Extractor.cpp b/media/libstagefright/MPEG4Extractor.cpp index 7cea6298c29a..d937838052b6 100644 --- a/media/libstagefright/MPEG4Extractor.cpp +++ b/media/libstagefright/MPEG4Extractor.cpp @@ -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'): { |