From 0a2d29a75b80c003519f48bca2abbac2092bd2f6 Mon Sep 17 00:00:00 2001
From: cehoyos <cehoyos@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Tue, 2 Nov 2010 14:17:05 +0000
Subject: [PATCH] codecs.conf, mp_taglists: Support FFmpeg LATM decoding

Also move libfaad codecs.conf entry into the same position as in svn
(no functionality change since ffaac is marked buggy so only faad is
used by default regardless or order).

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32571 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 etc/codecs.conf          | 37 ++++++++++++++++++++++---------------
 libmpdemux/mp_taglists.c |  3 +++
 2 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/etc/codecs.conf b/etc/codecs.conf
index a8c542f8e0..1a953394ef 100644
--- a/etc/codecs.conf
+++ b/etc/codecs.conf
@@ -4011,21 +4011,12 @@ audiocodec ffdv
   driver ffmpeg
   dll "dvaudio"
 
-audiocodec faad
-  info "FAAD AAC (MPEG-2/MPEG-4 Audio)"
-  status working
-  fourcc mp4a,MP4A,MP4L
-  fourcc "VLB " ; Used in NSV, not really working
-  fourcc "AAC " ; Used in NSV
-  fourcc "AACP" ; Used in NSV for AACPlus
-  fourcc raac,racp
-  format 0xff
-  format 0x706D
-  format 0x4143 ; aac in asf
-  format 0xA106 ; aac in avi
-  format 0xAAC0 ; Borgtech nonsense tag
-  driver faad
-  dll libfaad2
+audiocodec fflatm
+  info "FFmpeg AAC in LATM"
+  status buggy
+  fourcc "LATM" ; internal MPlayer FourCC
+  driver ffmpeg
+  dll aac_latm
 
 audiocodec ffaac
   info "FFmpeg AAC (MPEG-2/MPEG-4 Audio)"
@@ -4115,6 +4106,22 @@ audiocodec ffnellymoser
   driver ffmpeg
   dll "nellymoser"
 
+audiocodec faad
+  info "FAAD AAC (MPEG-2/MPEG-4 Audio)"
+  status working
+  fourcc mp4a,MP4A,MP4L
+  fourcc "VLB " ; Used in NSV, not really working
+  fourcc "AAC " ; Used in NSV
+  fourcc "AACP" ; Used in NSV for AACPlus
+  fourcc raac,racp
+  format 0xff
+  format 0x706D
+  format 0x4143 ; aac in asf
+  format 0xA106 ; aac in avi
+  format 0xAAC0 ; Borgtech nonsense tag
+  driver faad
+  dll libfaad2
+
 audiocodec pcm
   info "Uncompressed PCM"
   status working
diff --git a/libmpdemux/mp_taglists.c b/libmpdemux/mp_taglists.c
index 7fc68db5f9..ec64136056 100644
--- a/libmpdemux/mp_taglists.c
+++ b/libmpdemux/mp_taglists.c
@@ -65,6 +65,9 @@ const struct mp_AVCodecTag * const mp_wav_taglists[] = {mp_ff_codec_wav_tags, mp
 
 static const struct mp_AVCodecTag mp_codecid_override_tags[] = {
     { CODEC_ID_AAC,               MKTAG('M', 'P', '4', 'A')},
+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 94, 0)
+    { CODEC_ID_AAC_LATM,          MKTAG('L', 'A', 'T', 'M')},
+#endif
     { CODEC_ID_AC3,               0x2000},
     { CODEC_ID_ADPCM_IMA_AMV,     MKTAG('A', 'M', 'V', 'A')},
     { CODEC_ID_DTS,               0x2001},