[vlc-commits] Wav: Add other tags for AAC

Jean-Baptiste Kempf git at videolan.org
Fri Mar 11 23:23:51 CET 2011


vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Thu Mar 10 22:43:26 2011 +0100| [89bbb2b17b0a13ac4e165e88a0a51d22db02113d] | committer: Jean-Baptiste Kempf

Wav: Add other tags for AAC

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=89bbb2b17b0a13ac4e165e88a0a51d22db02113d
---

 include/vlc_codecs.h |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/include/vlc_codecs.h b/include/vlc_codecs.h
index 558baef..6fad0e2 100644
--- a/include/vlc_codecs.h
+++ b/include/vlc_codecs.h
@@ -235,6 +235,9 @@ ATTR_PACKED
 #define WAVE_FORMAT_WMAP                0x0162 /* WMA 9 Professional */
 #define WAVE_FORMAT_WMAL                0x0163 /* WMA 9 Lossless */
 
+#define WAVE_FORMAT_AAC_2               0x1601 /* Other AAC */
+#define WAVE_FORMAT_AAC_LATM            0x1602 /* AAC/LATM */
+
 #define WAVE_FORMAT_A52                 0x2000 /* a52 */
 #define WAVE_FORMAT_DTS                 0x2001 /* DTS */
 #define WAVE_FORMAT_FFMPEG_AAC          0x706D
@@ -345,6 +348,8 @@ wave_format_tag_to_fourcc[] =
     { WAVE_FORMAT_DTS_MS,     VLC_CODEC_DTS,                    "DTS Coherent Acoustics" },
     { WAVE_FORMAT_DIVIO_AAC,  VLC_CODEC_MP4A,                   "MPEG-4 Audio (Divio)" },
     { WAVE_FORMAT_AAC,        VLC_CODEC_MP4A,                   "MPEG-4 Audio" },
+    { WAVE_FORMAT_AAC_2,      VLC_CODEC_MP4A,                   "MPEG-4 Audio" },
+    { WAVE_FORMAT_AAC_LATM,   VLC_CODEC_MP4A,                   "MPEG-4 Audio" },
     { WAVE_FORMAT_FFMPEG_AAC, VLC_CODEC_MP4A,                   "MPEG-4 Audio" },
     { WAVE_FORMAT_VORBIS,     VLC_CODEC_VORBIS,                 "Vorbis Audio" },
     { WAVE_FORMAT_VORB_1,     VLC_FOURCC( 'v', 'o', 'r', '1' ), "Vorbis 1 Audio" },



More information about the vlc-commits mailing list