diff options
| author | Chong Zhang <chz@google.com> | 2015-05-27 21:17:11 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-27 21:17:12 +0000 |
| commit | ebdfefa496163fd32373699956a5492eca8990ff (patch) | |
| tree | 40b37ea7d900e8a09e42232047572e77e2f169cc /media | |
| parent | bcec2b0cebd873f8b80c11c8653326fc638af860 (diff) | |
| parent | 52c58bb699f274bb87722b8e942f14811af23cf8 (diff) | |
| download | frameworks_base-ebdfefa496163fd32373699956a5492eca8990ff.zip frameworks_base-ebdfefa496163fd32373699956a5492eca8990ff.tar.gz frameworks_base-ebdfefa496163fd32373699956a5492eca8990ff.tar.bz2 | |
Merge "MediaCodec: unhide mime type for EAC3" into mnc-dev
Diffstat (limited to 'media')
| -rw-r--r-- | media/java/android/media/MediaFormat.java | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/media/java/android/media/MediaFormat.java b/media/java/android/media/MediaFormat.java index 0e67daa..b2fa0ac 100644 --- a/media/java/android/media/MediaFormat.java +++ b/media/java/android/media/MediaFormat.java @@ -106,9 +106,6 @@ 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"; /** |