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 | 3c81bfb86cfa2b0bae4fea41cc26e3ce50af8517 (patch) | |
| tree | dfd51439479c50b920dfc1c1e47e905adcea3177 /include | |
| parent | 56938ef8dc82b49ddbc201a8855c91ba46d73bfb (diff) | |
| parent | 2ed5cf016c1b45426ae25ab105e02ff4bb992f28 (diff) | |
| download | frameworks_av-3c81bfb86cfa2b0bae4fea41cc26e3ce50af8517.zip frameworks_av-3c81bfb86cfa2b0bae4fea41cc26e3ce50af8517.tar.gz frameworks_av-3c81bfb86cfa2b0bae4fea41cc26e3ce50af8517.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; |