| commit | 7937b6bb18761683a9596ab4639ed6fc4fc7c5c1 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Fri Jul 07 19:08:31 2017 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Fri Jul 07 19:08:31 2017 +0000 |
| tree | e9b29d390d0b5c6c27dba85eedc5690670b9a7a1 | |
| parent | bdccee1eeec78be029c2ab77955ab71e1e0161e1 [diff] | |
| parent | 697535849d89c31e2c3b52847126ada6b1e258c3 [diff] |
Merge "Add 'dash' as a compatible brand"
diff --git a/media/libstagefright/MPEG4Extractor.cpp b/media/libstagefright/MPEG4Extractor.cpp index afcf661..4c0bb39 100644 --- a/media/libstagefright/MPEG4Extractor.cpp +++ b/media/libstagefright/MPEG4Extractor.cpp
@@ -5014,6 +5014,7 @@ FOURCC('3', 'g', 'p', '4'), FOURCC('m', 'p', '4', '1'), FOURCC('m', 'p', '4', '2'), + FOURCC('d', 'a', 's', 'h'), // Won't promise that the following file types can be played. // Just give these file types a chance.