diff options
| author | Marco Nelissen <marcone@google.com> | 2012-11-16 11:30:43 -0800 |
|---|---|---|
| committer | Marco Nelissen <marcone@google.com> | 2012-11-16 11:30:43 -0800 |
| commit | b7047796795083484c0bc9003f346b4022c3be9a (patch) | |
| tree | 78ef474ceb9fdb45e5e409c56a138adff5263eba /media/libstagefright/StagefrightMediaScanner.cpp | |
| parent | a1c1a7e4c9cb37726e4afc10d6678666087f8e1d (diff) | |
| parent | 205d72493af8150cc8f398ab4971b382965cd467 (diff) | |
| download | frameworks_av-b7047796795083484c0bc9003f346b4022c3be9a.zip frameworks_av-b7047796795083484c0bc9003f346b4022c3be9a.tar.gz frameworks_av-b7047796795083484c0bc9003f346b4022c3be9a.tar.bz2 | |
resolved conflicts for merge of 205d7249 to master
Change-Id: I3df408b6e30e0c0b2a19a3336134ce49fb73a8bb
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 359f2be..af8186c 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", ".awb" + ".avi", ".mpeg", ".mpg", ".awb", ".mpga" }; static const size_t kNumValidExtensions = sizeof(kValidExtensions) / sizeof(kValidExtensions[0]); |