diff options
| author | Marco Nelissen <marcone@google.com> | 2012-11-16 08:59:14 -0800 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2012-11-16 08:59:14 -0800 |
| commit | da33d66e68791d0bfeccebc8253a59467b5ef670 (patch) | |
| tree | 4c37fcdb7d1928c14c9bbffe0b9313dbd9a7fc07 | |
| parent | 33cf49b168a88a88167c46b01787a57b49cd875f (diff) | |
| parent | 03163f4ed4e130c5df454e3ab2a5bb3690c26be1 (diff) | |
Merge "Add .mpga to acceptable file name extensions list."
| -rw-r--r-- | media/libstagefright/StagefrightMediaScanner.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libstagefright/StagefrightMediaScanner.cpp b/media/libstagefright/StagefrightMediaScanner.cpp index b7cf96e1..bccffd85 100644 --- a/media/libstagefright/StagefrightMediaScanner.cpp +++ b/media/libstagefright/StagefrightMediaScanner.cpp @@ -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" + ".avi", ".mpeg", ".mpg", ".mpga" }; static const size_t kNumValidExtensions = sizeof(kValidExtensions) / sizeof(kValidExtensions[0]); |