summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorJames Dong <jdong@google.com>2010-04-13 15:06:41 -0700
committerJames Dong <jdong@google.com>2010-04-13 15:09:26 -0700
commite1130662d0455231853e7d6880bb84d8547d7229 (patch)
treeb2311a19363a003d97bf3b829ee9e71373c03ff9 /media
parent3069a6dafabd5a6ba2b1378e2c3b48adb9ba8778 (diff)
downloadframeworks_base-e1130662d0455231853e7d6880bb84d8547d7229.zip
frameworks_base-e1130662d0455231853e7d6880bb84d8547d7229.tar.gz
frameworks_base-e1130662d0455231853e7d6880bb84d8547d7229.tar.bz2
Snif more 3GPP file types according to http://www.ftyps.com/3gpp.html
bug - 2575956 Change-Id: Iaa79e74d3b0585397a7e833ec45472710fc52fa6
Diffstat (limited to 'media')
-rw-r--r--media/libstagefright/MPEG4Extractor.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/media/libstagefright/MPEG4Extractor.cpp b/media/libstagefright/MPEG4Extractor.cpp
index 0e21d08..323f145 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)) {