Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9a1ff831 authored by Andreas Huber's avatar Andreas Huber Committed by Android Git Automerger
Browse files

am c9a1ca3c: Merge "MediaCodec: docs: Clarify that audio/mp4a-latm is plain AAC, not in LATM" 

* commit 'c9a1ca3c':
  MediaCodec: docs: Clarify that audio/mp4a-latm is plain AAC, not in LATM
parents 8d1a32a4 c9a1ca3c

media/java/android/media/MediaCodec.java

+1 −1
Original line number Diff line number Diff line
@@ -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