diff options
| author | 2010-04-13 15:34:20 -0700 | |
|---|---|---|
| committer | 2010-04-13 15:34:20 -0700 | |
| commit | dd684af8c8fd5984d4d40b125bfac1ce268622ae (patch) | |
| tree | 84007aaedf93268701d10207b06322d93360eb39 | |
| parent | 812b24fd9d254f37e34f2878f599253a1f3bffe9 (diff) | |
| parent | e1130662d0455231853e7d6880bb84d8547d7229 (diff) | |
Merge "Snif more 3GPP file types according to http://www.ftyps.com/3gpp.html" into froyo
| -rw-r--r-- | media/libstagefright/MPEG4Extractor.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/media/libstagefright/MPEG4Extractor.cpp b/media/libstagefright/MPEG4Extractor.cpp index 0e21d0835491..323f1451a9bc 100644 --- a/media/libstagefright/MPEG4Extractor.cpp +++ b/media/libstagefright/MPEG4Extractor.cpp @@ -1642,6 +1642,8 @@ bool SniffMPEG4( } if (!memcmp(header, "ftyp3gp", 7) || !memcmp(header, "ftypmp42", 8) + || !memcmp(header, "ftyp3gr6", 8) || !memcmp(header, "ftyp3gs6", 8) + || !memcmp(header, "ftyp3ge6", 8) || !memcmp(header, "ftyp3gg6", 8) || !memcmp(header, "ftypisom", 8) || !memcmp(header, "ftypM4V ", 8) || !memcmp(header, "ftypM4A ", 8) || !memcmp(header, "ftypf4v ", 8) || !memcmp(header, "ftypkddi", 8) || !memcmp(header, "ftypM4VP", 8)) { |