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 | 205d72493af8150cc8f398ab4971b382965cd467 (patch) | |
| tree | 4b9d9c8621565d5a780fa1f712ebd21cf4ff750f | |
| parent | dbb74f4ee1a971da71f26739d870fc9334100499 (diff) | |
| parent | da33d66e68791d0bfeccebc8253a59467b5ef670 (diff) | |
| download | frameworks_av-205d72493af8150cc8f398ab4971b382965cd467.zip frameworks_av-205d72493af8150cc8f398ab4971b382965cd467.tar.gz frameworks_av-205d72493af8150cc8f398ab4971b382965cd467.tar.bz2 | |
am da33d66e: Merge "Add .mpga to acceptable file name extensions list."
* commit 'da33d66e68791d0bfeccebc8253a59467b5ef670':
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]); |