commit f3209f65de8e872f36e0bd1d1f0e10d339a6bb12
author Treehugger Robot <treehugger-gerrit@google.com> Thu Nov 29 19:58:58 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Nov 29 19:58:58 2018 +0000
tree a5027a9f3c6ff2dc0964e14bc1456c14282645ed
parent e816ba20c5e8bb1e5bd8cb9ee150445ae45dd5be
parent 896c20959ae68c2fbb230c68592fb2f01f9c0fe8

Merge "Add .m4r to media scanner extensions"

media/libstagefright/StagefrightMediaScanner.cpp

diff --git a/media/libstagefright/StagefrightMediaScanner.cpp b/media/libstagefright/StagefrightMediaScanner.cpp
index 610b961..17187a8 100644
--- a/media/libstagefright/StagefrightMediaScanner.cpp
+++ b/media/libstagefright/StagefrightMediaScanner.cpp
@@ -41,7 +41,7 @@
         ".wav", ".amr", ".midi", ".xmf", ".rtttl", ".rtx", ".ota",
         ".mkv", ".mka", ".webm", ".ts", ".fl", ".flac", ".mxmf",
         ".avi", ".mpeg", ".mpg", ".awb", ".mpga", ".mov",
-        ".m4v", ".oga"
+        ".m4v", ".oga", ".m4r"
     };
     static const size_t kNumValidExtensions =
         sizeof(kValidExtensions) / sizeof(kValidExtensions[0]);