commit 0377dccbf8220c4d5d02892fa30911957c0e7a0b
author Marco Nelissen <marcone@google.com> Fri Jul 07 19:16:27 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Jul 07 19:16:27 2017 +0000
tree 954285eb3d11ff68678daacc2397a5d1164018eb
parent 1a3af9525ad321d727e8656cb440f323eb76d05a
parent 7937b6bb18761683a9596ab4639ed6fc4fc7c5c1

Merge "Add 'dash' as a compatible brand"
am: 7937b6bb18

Change-Id: Iae7f10136ef4e8aafc858178d304227a8b7a79f3

media/libstagefright/MPEG4Extractor.cpp

diff --git a/media/libstagefright/MPEG4Extractor.cpp b/media/libstagefright/MPEG4Extractor.cpp
index 7614e46..941c759 100644
--- a/media/libstagefright/MPEG4Extractor.cpp
+++ b/media/libstagefright/MPEG4Extractor.cpp
@@ -5209,6 +5209,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.