| commit | 9a218f048891ed3a541c2cb7fe35771dfa591fac | [log] [tgz] |
|---|---|---|
| author | Marco Nelissen <marcone@google.com> | Fri Jan 25 20:43:10 2019 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Jan 25 20:43:10 2019 +0000 |
| tree | 01315490461a5cd986daa34250f69b59a19e9d3e | |
| parent | 9bbc3b145b7a217840e4bd1b34b65b58fc8ca5bc [diff] | |
| parent | f37a9661c9ef30e23f06c3fa980849bfe335846f [diff] |
Merge "Cannot play mp4 file with major brand 'wmf'"
diff --git a/media/extractors/mp4/MPEG4Extractor.cpp b/media/extractors/mp4/MPEG4Extractor.cpp index 50f172e..d0efddd 100644 --- a/media/extractors/mp4/MPEG4Extractor.cpp +++ b/media/extractors/mp4/MPEG4Extractor.cpp
@@ -6048,6 +6048,7 @@ // Just give these file types a chance. FOURCC("qt "), // Apple's QuickTime FOURCC("MSNV"), // Sony's PSP + FOURCC("wmf "), FOURCC("3g2a"), // 3GPP2 FOURCC("3g2b"),