diff options
| author | Marco Nelissen <marcone@google.com> | 2012-11-16 09:34:19 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-11-16 09:34:19 -0800 |
| commit | 50fee506df0f18a2f0c2686b47dbce2170d4ee01 (patch) | |
| tree | f0025e4f46de7fac1b71a10cc7e582c1df552d16 /media/libstagefright/StagefrightMediaScanner.cpp | |
| parent | 830fbc06b6b5f2d3d14888fc39f7ac2d71ec5408 (diff) | |
| parent | f42cde8ede088529c231de6a7aee7f043a7fcd09 (diff) | |
| download | frameworks_av-50fee506df0f18a2f0c2686b47dbce2170d4ee01.zip frameworks_av-50fee506df0f18a2f0c2686b47dbce2170d4ee01.tar.gz frameworks_av-50fee506df0f18a2f0c2686b47dbce2170d4ee01.tar.bz2 | |
am da33d66e: Merge "Add .mpga to acceptable file name extensions list."
* commit 'da33d66e68791d0bfeccebc8253a59467b5ef670':
Add .mpga to acceptable file name extensions list.
Diffstat (limited to 'media/libstagefright/StagefrightMediaScanner.cpp')
| -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]); |