commit 1f857164a5c60b94d2ee5d9003dc9e4c5af9b757
author Andreas Huber <andih@google.com> Fri Apr 02 11:26:55 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Apr 02 11:26:55 2010 -0700
tree 83651b98305c4f6ba7f7e96ba5c1c4498d1778cd
parent 942d070cc6aed67d6d876ec6bce07f89d6963643
parent f0e62b7a50e3f72a6e7bad510a2d605656b297ad

am f0e62b7a: am 29039dee: Merge "Support another kind of iso mpeg4 file." into froyo

Merge commit 'f0e62b7a50e3f72a6e7bad510a2d605656b297ad' into kraken

* commit 'f0e62b7a50e3f72a6e7bad510a2d605656b297ad':
  Support another kind of iso mpeg4 file.

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;