| commit | e3a7f1b68091e9e8c6acd8ae07419075b082dd0b | [log] [tgz] |
|---|---|---|
| author | Peter Collingbourne <pcc@google.com> | Tue Mar 19 20:52:53 2019 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Tue Mar 19 20:52:53 2019 +0000 |
| tree | f9c803f66453fb39e8d73fcd360e475fc1e5590d | |
| parent | 5e195df5d73cae31c40f122336e35692cc5c439e [diff] | |
| parent | 007ac1ad82b7112e2e77db4914b93cd461c93c73 [diff] |
Merge "Switch from getrlimit(RLIMIT_AS) to android_mallopt(M_SET_ALLOCATION_LIMIT_BYTES)."
diff --git a/media/extractors/mp4/MPEG4Extractor.cpp b/media/extractors/mp4/MPEG4Extractor.cpp index 30873ae..0142333 100644 --- a/media/extractors/mp4/MPEG4Extractor.cpp +++ b/media/extractors/mp4/MPEG4Extractor.cpp
@@ -5592,6 +5592,7 @@ FOURCC("mp41"), FOURCC("mp42"), FOURCC("dash"), + FOURCC("nvr1"), // Won't promise that the following file types can be played. // Just give these file types a chance.