summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorChong Zhang <chz@google.com>2015-05-27 14:07:29 -0700
committerChong Zhang <chz@google.com>2015-05-27 14:07:29 -0700
commit52c58bb699f274bb87722b8e942f14811af23cf8 (patch)
tree21dca1f3f8a11c8bcd760a369783ee6c9262c12e /api
parent6f63a27584e555622ecf1be733983640c276d423 (diff)
downloadframeworks_base-52c58bb699f274bb87722b8e942f14811af23cf8.zip
frameworks_base-52c58bb699f274bb87722b8e942f14811af23cf8.tar.gz
frameworks_base-52c58bb699f274bb87722b8e942f14811af23cf8.tar.bz2
MediaCodec: unhide mime type for EAC3
bug: 18723951 Change-Id: I8c77be6ede428e92b089b19b2bd627992466a591
Diffstat (limited to 'api')
-rw-r--r--api/current.txt1
-rw-r--r--api/system-current.txt1
2 files changed, 2 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt
index 41acac5..9c745e1 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -15909,6 +15909,7 @@ package android.media {
field public static final java.lang.String MIMETYPE_AUDIO_AC3 = "audio/ac3";
field public static final java.lang.String MIMETYPE_AUDIO_AMR_NB = "audio/3gpp";
field public static final java.lang.String MIMETYPE_AUDIO_AMR_WB = "audio/amr-wb";
+ field public static final java.lang.String MIMETYPE_AUDIO_EAC3 = "audio/eac3";
field public static final java.lang.String MIMETYPE_AUDIO_FLAC = "audio/flac";
field public static final java.lang.String MIMETYPE_AUDIO_G711_ALAW = "audio/g711-alaw";
field public static final java.lang.String MIMETYPE_AUDIO_G711_MLAW = "audio/g711-mlaw";
diff --git a/api/system-current.txt b/api/system-current.txt
index 0f6bd2a..4fc2844 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -17145,6 +17145,7 @@ package android.media {
field public static final java.lang.String MIMETYPE_AUDIO_AC3 = "audio/ac3";
field public static final java.lang.String MIMETYPE_AUDIO_AMR_NB = "audio/3gpp";
field public static final java.lang.String MIMETYPE_AUDIO_AMR_WB = "audio/amr-wb";
+ field public static final java.lang.String MIMETYPE_AUDIO_EAC3 = "audio/eac3";
field public static final java.lang.String MIMETYPE_AUDIO_FLAC = "audio/flac";
field public static final java.lang.String MIMETYPE_AUDIO_G711_ALAW = "audio/g711-alaw";
field public static final java.lang.String MIMETYPE_AUDIO_G711_MLAW = "audio/g711-mlaw";