diff options
| author | Rachad <rachad@google.com> | 2015-01-10 01:31:01 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-01-10 01:31:01 +0000 |
| commit | 2a7991ee2f331c242ff9f7b87058e64b50a616fd (patch) | |
| tree | e887d92e540e17aed1352419a0faf887faa0bfbc /media | |
| parent | 8f8dc4882bc61b7e273ac991e2ae99834d55b7d0 (diff) | |
| parent | b60bb35650c7075bc66bf2b8f5c0fbe428092010 (diff) | |
| download | frameworks_base-2a7991ee2f331c242ff9f7b87058e64b50a616fd.zip frameworks_base-2a7991ee2f331c242ff9f7b87058e64b50a616fd.tar.gz frameworks_base-2a7991ee2f331c242ff9f7b87058e64b50a616fd.tar.bz2 | |
am 6d3cff12: Merge "MediaCodec: Added E-AC3 mime type (@hide)." into lmp-mr1-dev
automerge: b60bb35
* commit 'b60bb35650c7075bc66bf2b8f5c0fbe428092010':
MediaCodec: Added E-AC3 mime type (@hide).
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. |