diff options
| author | 2010-04-02 11:18:32 -0700 | |
|---|---|---|
| committer | 2010-04-02 11:18:32 -0700 | |
| commit | 29039deea99a5529d92f7add3f9077ab247d3acd (patch) | |
| tree | 4534696ce629f5caaba943cc492fcab8b2b23001 | |
| parent | 219909224d9f5fdb4fe1c97fad048894c4619fe7 (diff) | |
| parent | eea1eefeada90ec54488e1742e81e4226fc6ace5 (diff) | |
Merge "Support another kind of iso mpeg4 file." into froyo
| -rw-r--r-- | media/libstagefright/MPEG4Extractor.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libstagefright/MPEG4Extractor.cpp b/media/libstagefright/MPEG4Extractor.cpp index f50451df0ed7..bd3925acef60 100644 --- a/media/libstagefright/MPEG4Extractor.cpp +++ b/media/libstagefright/MPEG4Extractor.cpp @@ -1626,7 +1626,7 @@ bool SniffMPEG4( if (!memcmp(header, "ftyp3gp", 7) || !memcmp(header, "ftypmp42", 8) || !memcmp(header, "ftypisom", 8) || !memcmp(header, "ftypM4V ", 8) || !memcmp(header, "ftypM4A ", 8) || !memcmp(header, "ftypf4v ", 8) - || !memcmp(header, "ftypkddi", 8)) { + || !memcmp(header, "ftypkddi", 8) || !memcmp(header, "ftypM4VP", 8)) { *mimeType = MEDIA_MIMETYPE_CONTAINER_MPEG4; *confidence = 0.1; |