diff options
| author | Andreas Huber <andih@google.com> | 2010-02-10 11:16:14 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-02-10 11:16:14 -0800 |
| commit | cb5b4896ebc1ee36b254866f6c9a3f376d68d0ac (patch) | |
| tree | 702f946881e2300613eaa8a3f53e76bbcfccb826 /media/libstagefright | |
| parent | 758cc74ff08487ded45f7ff4476c200fe727b366 (diff) | |
| parent | c5b366a4b428e7dd0626e33193e51180ad3ab8ba (diff) | |
| download | frameworks_av-cb5b4896ebc1ee36b254866f6c9a3f376d68d0ac.zip frameworks_av-cb5b4896ebc1ee36b254866f6c9a3f376d68d0ac.tar.gz frameworks_av-cb5b4896ebc1ee36b254866f6c9a3f376d68d0ac.tar.bz2 | |
Merge "Properly detect Adobe's .f4v file format as an mp4 ISO compliant file."
Diffstat (limited to 'media/libstagefright')
| -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 4458006..1ff38ee 100644 --- a/media/libstagefright/MPEG4Extractor.cpp +++ b/media/libstagefright/MPEG4Extractor.cpp @@ -1540,7 +1540,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, "ftypM4A ", 8) || !memcmp(header, "ftypf4v ", 8)) { *mimeType = MEDIA_MIMETYPE_CONTAINER_MPEG4; *confidence = 0.1; |