diff options
| author | Marco Nelissen <marcone@google.com> | 2012-11-16 08:19:30 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-11-16 08:19:31 -0800 |
| commit | a1c1a7e4c9cb37726e4afc10d6678666087f8e1d (patch) | |
| tree | 1003b5abef78fbc3e5cb7567f3296fb08cb90b0e /include | |
| parent | aac817e6685a51843e84c23d970b3d559e74e8f6 (diff) | |
| parent | ba933df89521d63f75ca66af12ce9d7ae9496b9e (diff) | |
| download | frameworks_av-a1c1a7e4c9cb37726e4afc10d6678666087f8e1d.zip frameworks_av-a1c1a7e4c9cb37726e4afc10d6678666087f8e1d.tar.gz frameworks_av-a1c1a7e4c9cb37726e4afc10d6678666087f8e1d.tar.bz2 | |
Merge "Add GSM 6.10 decoder"
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/stagefright/MediaDefs.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/media/stagefright/MediaDefs.h b/include/media/stagefright/MediaDefs.h index 457d5d7..81de6e4 100644 --- a/include/media/stagefright/MediaDefs.h +++ b/include/media/stagefright/MediaDefs.h @@ -42,6 +42,7 @@ extern const char *MEDIA_MIMETYPE_AUDIO_G711_MLAW; extern const char *MEDIA_MIMETYPE_AUDIO_RAW; extern const char *MEDIA_MIMETYPE_AUDIO_FLAC; extern const char *MEDIA_MIMETYPE_AUDIO_AAC_ADTS; +extern const char *MEDIA_MIMETYPE_AUDIO_MSGSM; extern const char *MEDIA_MIMETYPE_CONTAINER_MPEG4; extern const char *MEDIA_MIMETYPE_CONTAINER_WAV; |