commit b514a24eac5d9f5a3a9cdb3b7319918c39198769
author Andreas Huber <andih@google.com> Fri Apr 02 14:03:46 2010 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Fri Apr 02 14:03:46 2010 -0700
tree 0b451724c6d90b68341baf990ec42a934336c51a
parent fcdfad530df30d0e7fe21a7a463a3fe369ed325a
parent 7f498b90a4300ef9badf14d202b0a67c26e20931

Merge "Coalesce multiple encoded AAC frames into a single input buffer on this particular OMX codec to increase throughput significantly." into froyo

media/libstagefright/MPEG4Extractor.cpp

diff --git a/media/libstagefright/MPEG4Extractor.cpp b/media/libstagefright/MPEG4Extractor.cpp
index f50451d..bd3925a 100644
--- a/media/libstagefright/MPEG4Extractor.cpp
+++ b/media/libstagefright/MPEG4Extractor.cpp
@@ -1626,7 +1626,7 @@
     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;