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

Commit b7047796 authored by Marco Nelissen's avatar Marco Nelissen
Browse files

resolved conflicts for merge of 205d7249 to master 

Change-Id: I3df408b6e30e0c0b2a19a3336134ce49fb73a8bb
parents a1c1a7e4 205d7249

media/libstagefright/StagefrightMediaScanner.cpp

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ static bool FileHasAcceptableExtension(const char *extension) { 
        ".mpeg", ".ogg", ".mid", ".smf", ".imy", ".wma", ".aac",

        ".wav", ".amr", ".midi", ".xmf", ".rtttl", ".rtx", ".ota",

        ".mkv", ".mka", ".webm", ".ts", ".fl", ".flac", ".mxmf",

        ".avi", ".mpeg", ".mpg", ".awb"

        ".avi", ".mpeg", ".mpg", ".awb", ".mpga"

    };

    static const size_t kNumValidExtensions =

        sizeof(kValidExtensions) / sizeof(kValidExtensions[0]);