diff options
| author | Rachad <rachad@google.com> | 2015-01-10 01:27:31 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-10 01:27:31 +0000 |
| commit | b60bb35650c7075bc66bf2b8f5c0fbe428092010 (patch) | |
| tree | 03a752c46389de1b8de19d1e4f75f28d7394b390 | |
| parent | 0f647c19f970bfb14a48f6b014ea26ce57c224f4 (diff) | |
| parent | 6d3cff12648f8ca3bcc0ac190d1d6d2e49514b66 (diff) | |
| download | frameworks_base-b60bb35650c7075bc66bf2b8f5c0fbe428092010.zip frameworks_base-b60bb35650c7075bc66bf2b8f5c0fbe428092010.tar.gz frameworks_base-b60bb35650c7075bc66bf2b8f5c0fbe428092010.tar.bz2 | |
am 6d3cff12: Merge "MediaCodec: Added E-AC3 mime type (@hide)." into lmp-mr1-dev
* commit '6d3cff12648f8ca3bcc0ac190d1d6d2e49514b66':
MediaCodec: Added E-AC3 mime type (@hide).
| -rw-r--r-- | media/java/android/media/MediaFormat.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/media/java/android/media/MediaFormat.java b/media/java/android/media/MediaFormat.java index 8faa75c..4356a3e 100644 --- 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. |