Merge "MediaCodec: Added E-AC3 mime type (@hide)." into lmp-mr1-dev

2015-01-10 01:23:34 +00:00
parent 8c52d9a092 6564f5be74
commit 6d3cff1264
1 changed files with 4 additions and 0 deletions
--- a/media/java/android/media/MediaFormat.java
+++ b/media/java/android/media/MediaFormat.java
@@ -106,6 +106,10 @@ public final class MediaFormat {
    public static final String MIMETYPE_AUDIO_FLAC = "audio/flac";
    public static final String MIMETYPE_AUDIO_MSGSM = "audio/gsm";
    public static final String MIMETYPE_AUDIO_AC3 = "audio/ac3";
+    /**
+     * @hide
+     */
+    public static final String MIMETYPE_AUDIO_EAC3 = "audio/eac3";

    /**
     * MIME type for WebVTT subtitle data.