diff options
| author | James Dong <jdong@google.com> | 2011-04-25 21:54:56 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-04-25 21:54:56 -0700 |
| commit | 2e40530f7cbb024b60c491f42dadb2597d4de07e (patch) | |
| tree | 25a17101ba9d1b7c1ff37235eb35fa9d3182385e /media/libstagefright/MPEG4Extractor.cpp | |
| parent | 8a9ce255302b09c66cc2e60080ec57905ed0a2fe (diff) | |
| parent | 4cb2c4dc7af70684e81cfbce46cbcbb9e44f4dc4 (diff) | |
| download | frameworks_av-2e40530f7cbb024b60c491f42dadb2597d4de07e.zip frameworks_av-2e40530f7cbb024b60c491f42dadb2597d4de07e.tar.gz frameworks_av-2e40530f7cbb024b60c491f42dadb2597d4de07e.tar.bz2 | |
Merge "Give PSP and QuickTime compatible mp4 files a chance to play"
Diffstat (limited to 'media/libstagefright/MPEG4Extractor.cpp')
| -rw-r--r-- | media/libstagefright/MPEG4Extractor.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/media/libstagefright/MPEG4Extractor.cpp b/media/libstagefright/MPEG4Extractor.cpp index 01d0a92..8787214 100644 --- a/media/libstagefright/MPEG4Extractor.cpp +++ b/media/libstagefright/MPEG4Extractor.cpp @@ -2130,6 +2130,11 @@ static bool isCompatibleBrand(uint32_t fourcc) { FOURCC('3', 'g', 'p', '4'), FOURCC('m', 'p', '4', '1'), FOURCC('m', 'p', '4', '2'), + + // Won't promise that the following file types can be played. + // Just give these file types a chance. + FOURCC('q', 't', ' ', ' '), // Apple's QuickTime + FOURCC('M', 'S', 'N', 'V'), // Sony's PSP }; for (size_t i = 0; |