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 | 19b247a8531b27cd32df84fc90f87a21e011d7a6 (patch) | |
| tree | d34d30f142a1746058ce3a07472bcb83710e7bdd /media | |
| parent | ccd07716d105125b2eb2f1280b8c3fe9f57e78f3 (diff) | |
| parent | a6932498a00735c4e438bb9c47478ff166e2d6fd (diff) | |
| download | frameworks_av-19b247a8531b27cd32df84fc90f87a21e011d7a6.zip frameworks_av-19b247a8531b27cd32df84fc90f87a21e011d7a6.tar.gz frameworks_av-19b247a8531b27cd32df84fc90f87a21e011d7a6.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", |