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

Commit cdbd8711 authored by Chong Zhang's avatar Chong Zhang Committed by android-build-merger
Browse files

Merge "Add .m4r to media scanner extensions" am: f3209f65 am: c969804c 

am: 33961ca6

Change-Id: I3e1a183097aa2a86c84b0c34f88c7db01f299679
parents 68d7da1f 33961ca6

media/libstagefright/StagefrightMediaScanner.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -41,7 +41,7 @@ static bool FileHasAcceptableExtension(const char *extension) { 
        ".wav", ".amr", ".midi", ".xmf", ".rtttl", ".rtx", ".ota",

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

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

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

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

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

        ".m4v", ".oga"

        ".m4v", ".oga", ".m4r"

    };

    };

    static const size_t kNumValidExtensions =

    static const size_t kNumValidExtensions =

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

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