Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
automerge: b60bb35

* commit 'b60bb35650c7075bc66bf2b8f5c0fbe428092010':
  MediaCodec: Added E-AC3 mime type (@hide).
This commit is contained in:
Rachad
2015-01-10 01:31:01 +00:00
committed by android-build-merger
parent 8f8dc4882b b60bb35650
commit 2a7991ee2f
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
media/java/android/media/MediaFormat.java
View File

@@ -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.