diff options
| author | 2013-04-03 16:09:15 +0000 | |
|---|---|---|
| committer | 2013-04-03 16:09:16 +0000 | |
| commit | c9a1ca3c1a9f8591b675b980c1e390be8d901b39 (patch) | |
| tree | 4496cc43c5220e9a4088e30df8199b517e351617 | |
| parent | ddc16ef4387ca25c607348f6155771f17a049763 (diff) | |
| parent | d2aaff582ad7928291bd1ba6e7fb5f5366e8e189 (diff) | |
Merge "MediaCodec: docs: Clarify that audio/mp4a-latm is plain AAC, not in LATM"
| -rw-r--r-- | media/java/android/media/MediaCodec.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/java/android/media/MediaCodec.java b/media/java/android/media/MediaCodec.java index d5515eb7839f..4502227ffd2a 100644 --- a/media/java/android/media/MediaCodec.java +++ b/media/java/android/media/MediaCodec.java @@ -170,7 +170,7 @@ final public class MediaCodec { * <li>"audio/3gpp" - AMR narrowband audio * <li>"audio/amr-wb" - AMR wideband audio * <li>"audio/mpeg" - MPEG1/2 audio layer III - * <li>"audio/mp4a-latm" - AAC audio + * <li>"audio/mp4a-latm" - AAC audio (note, this is raw AAC packets, not packaged in LATM!) * <li>"audio/vorbis" - vorbis audio * <li>"audio/g711-alaw" - G.711 alaw audio * <li>"audio/g711-mlaw" - G.711 ulaw audio |