Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e49dc6a1 authored by Marco Nelissen's avatar Marco Nelissen Committed by android-build-merger
Browse files

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

am: 0377dccb

Change-Id: I631278692ac2374ce49cdcf262a524bbdab258d6
parents f3ac05af 0377dccb

media/libstagefright/MPEG4Extractor.cpp

+1 −0
Original line number Diff line number Diff line
@@ -5209,6 +5209,7 @@ static bool isCompatibleBrand(uint32_t fourcc) { 
        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.