summaryrefslogtreecommitdiffstats
path: root/include/media/stagefright/MediaDefs.h
diff options
context:
space:
mode:
authorRachad <rachad@google.com>2015-01-10 02:00:10 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-01-10 02:00:10 +0000
commit7e85361e364bf8f80ab43dd5feb0f584e481019e (patch)
treefbc76909e02d1aab4f53f2ec76063c0ce92fbdd0 /include/media/stagefright/MediaDefs.h
parente6453027baf4c79e95b31aa602b18621e3118423 (diff)
parent26c73acb73b5af94cb27e5d285d1708d25eb6892 (diff)
downloadframeworks_av-7e85361e364bf8f80ab43dd5feb0f584e481019e.zip
frameworks_av-7e85361e364bf8f80ab43dd5feb0f584e481019e.tar.gz
frameworks_av-7e85361e364bf8f80ab43dd5feb0f584e481019e.tar.bz2
am 26c73acb: am 0b460ad7: Merge "ACodec: Added support for E-AC3 decoders" into lmp-mr1-dev
* commit '26c73acb73b5af94cb27e5d285d1708d25eb6892': ACodec: Added support for E-AC3 decoders
Diffstat (limited to 'include/media/stagefright/MediaDefs.h')
-rw-r--r--include/media/stagefright/MediaDefs.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/media/stagefright/MediaDefs.h b/include/media/stagefright/MediaDefs.h
index e67d4d5..13695d5 100644
--- a/include/media/stagefright/MediaDefs.h
+++ b/include/media/stagefright/MediaDefs.h
@@ -47,6 +47,7 @@ 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_AUDIO_AC3;
+extern const char *MEDIA_MIMETYPE_AUDIO_EAC3;
extern const char *MEDIA_MIMETYPE_CONTAINER_MPEG4;
extern const char *MEDIA_MIMETYPE_CONTAINER_WAV;