diff options
| author | Andreas Huber <andih@google.com> | 2010-05-20 14:56:53 -0700 |
|---|---|---|
| committer | Andreas Huber <andih@google.com> | 2010-05-20 14:56:53 -0700 |
| commit | 093437c388e5dff6903a3d43f2ca9f8a1ba4744a (patch) | |
| tree | e60f6bdcb9589bd8476123a6aff0bb3836daa675 /media/libstagefright/StagefrightMediaScanner.cpp | |
| parent | cf14f10b7bf39a84205333b87d5c5b7db9598de3 (diff) | |
| download | frameworks_av-093437c388e5dff6903a3d43f2ca9f8a1ba4744a.zip frameworks_av-093437c388e5dff6903a3d43f2ca9f8a1ba4744a.tar.gz frameworks_av-093437c388e5dff6903a3d43f2ca9f8a1ba4744a.tar.bz2 | |
Support for media extraction from .mkv/.mka Matroska files in stagefright.
Change-Id: I4c26579828ad575523ccf58b0b5cb144046c04ca
related-to-bug: 2483739
Diffstat (limited to 'media/libstagefright/StagefrightMediaScanner.cpp')
| -rw-r--r-- | media/libstagefright/StagefrightMediaScanner.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/media/libstagefright/StagefrightMediaScanner.cpp b/media/libstagefright/StagefrightMediaScanner.cpp index 03287dd..ab17b04 100644 --- a/media/libstagefright/StagefrightMediaScanner.cpp +++ b/media/libstagefright/StagefrightMediaScanner.cpp @@ -42,7 +42,8 @@ static bool FileHasAcceptableExtension(const char *extension) { static const char *kValidExtensions[] = { ".mp3", ".mp4", ".m4a", ".3gp", ".3gpp", ".3g2", ".3gpp2", ".mpeg", ".ogg", ".mid", ".smf", ".imy", ".wma", ".aac", - ".wav", ".amr", ".midi", ".xmf", ".rtttl", ".rtx", ".ota" + ".wav", ".amr", ".midi", ".xmf", ".rtttl", ".rtx", ".ota", + ".mkv", ".mka", ".webm" }; static const size_t kNumValidExtensions = sizeof(kValidExtensions) / sizeof(kValidExtensions[0]); |