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 | f42cde8ede088529c231de6a7aee7f043a7fcd09 (patch) | |
| tree | ba3ae758aaddaf8de92168c23e98d13d75a5344e | |
| parent | f0e3acd06af00c07bfb541090b5349618fa67507 (diff) | |
| parent | 19af4c7966bda963f5d9143bd60f58a9e171cf0a (diff) | |
| download | frameworks_av-f42cde8ede088529c231de6a7aee7f043a7fcd09.zip frameworks_av-f42cde8ede088529c231de6a7aee7f043a7fcd09.tar.gz frameworks_av-f42cde8ede088529c231de6a7aee7f043a7fcd09.tar.bz2 | |
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 b7cf96e..bccffd8 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]); |