diff options
| author | Rachad <rachad@google.com> | 2015-01-10 02:06:41 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-10 02:06:41 +0000 |
| commit | b60bf91d2b1b2e45166cbb1eff9499de8b1c1105 (patch) | |
| tree | 8cfcdb2445524a2f523009a891b39ea37828a3ad /media/libstagefright/MediaDefs.cpp | |
| parent | 8b5fa52002319b7c808cac468292af8527e2b858 (diff) | |
| parent | 7e85361e364bf8f80ab43dd5feb0f584e481019e (diff) | |
| download | frameworks_av-b60bf91d2b1b2e45166cbb1eff9499de8b1c1105.zip frameworks_av-b60bf91d2b1b2e45166cbb1eff9499de8b1c1105.tar.gz frameworks_av-b60bf91d2b1b2e45166cbb1eff9499de8b1c1105.tar.bz2 | |
am 7e85361e: am 26c73acb: am 0b460ad7: Merge "ACodec: Added support for E-AC3 decoders" into lmp-mr1-dev
* commit '7e85361e364bf8f80ab43dd5feb0f584e481019e':
ACodec: Added support for E-AC3 decoders
Diffstat (limited to 'media/libstagefright/MediaDefs.cpp')
| -rw-r--r-- | media/libstagefright/MediaDefs.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/media/libstagefright/MediaDefs.cpp b/media/libstagefright/MediaDefs.cpp index fde6fbd..c48a5ae 100644 --- a/media/libstagefright/MediaDefs.cpp +++ b/media/libstagefright/MediaDefs.cpp @@ -46,6 +46,7 @@ const char *MEDIA_MIMETYPE_AUDIO_FLAC = "audio/flac"; const char *MEDIA_MIMETYPE_AUDIO_AAC_ADTS = "audio/aac-adts"; const char *MEDIA_MIMETYPE_AUDIO_MSGSM = "audio/gsm"; const char *MEDIA_MIMETYPE_AUDIO_AC3 = "audio/ac3"; +const char *MEDIA_MIMETYPE_AUDIO_EAC3 = "audio/eac3"; const char *MEDIA_MIMETYPE_CONTAINER_MPEG4 = "video/mp4"; const char *MEDIA_MIMETYPE_CONTAINER_WAV = "audio/x-wav"; |