diff options
| author | Marco Nelissen <marcone@google.com> | 2012-09-05 19:19:23 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-09-05 19:19:23 -0700 |
| commit | 74262b573c3d87c323c41d364af12f206ae46642 (patch) | |
| tree | a17344ca14fc66db9755289e8a86827de6e0909c /media | |
| parent | 9c6cb7a896f41cb8ad2f2ad63f8f6edfbb56ed4f (diff) | |
| parent | 5c5f8d93667ec36fbcd01ecb113ccae78322c85b (diff) | |
| download | frameworks_av-74262b573c3d87c323c41d364af12f206ae46642.zip frameworks_av-74262b573c3d87c323c41d364af12f206ae46642.tar.gz frameworks_av-74262b573c3d87c323c41d364af12f206ae46642.tar.bz2 | |
Merge "To support .mxmf which is specified in Android CDD." into jb-mr1-dev
Diffstat (limited to 'media')
| -rw-r--r-- | media/libmediaplayerservice/MediaPlayerFactory.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/media/libmediaplayerservice/MediaPlayerFactory.cpp b/media/libmediaplayerservice/MediaPlayerFactory.cpp index f821cc3..3f69c11 100644 --- a/media/libmediaplayerservice/MediaPlayerFactory.cpp +++ b/media/libmediaplayerservice/MediaPlayerFactory.cpp @@ -246,6 +246,7 @@ class SonivoxPlayerFactory : public MediaPlayerFactory::IFactory { ".midi", ".smf", ".xmf", + ".mxmf", ".imy", ".rtttl", ".rtx", |