diff options
| author | Rachad <rachad@google.com> | 2015-01-10 01:23:34 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-01-10 01:23:35 +0000 |
| commit | 6d3cff12648f8ca3bcc0ac190d1d6d2e49514b66 (patch) | |
| tree | 190eb634e22aec92b61fe34d24d60c239e35ae64 /media | |
| parent | 8c52d9a092452837e7222d8416c3b4accf9a99d7 (diff) | |
| parent | 6564f5be74f7c2cd1db5c5c5693338c613c2074e (diff) | |
| download | frameworks_base-6d3cff12648f8ca3bcc0ac190d1d6d2e49514b66.zip frameworks_base-6d3cff12648f8ca3bcc0ac190d1d6d2e49514b66.tar.gz frameworks_base-6d3cff12648f8ca3bcc0ac190d1d6d2e49514b66.tar.bz2 | |
Merge "MediaCodec: Added E-AC3 mime type (@hide)." into lmp-mr1-dev
Diffstat (limited to 'media')
| -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. |