[MPlayer-cvslog] r32571 - in trunk: etc/codecs.conf libmpdemux/mp_taglists.c

[cehoyos]

Author: cehoyos
Date: Tue Nov  2 15:17:05 2010
New Revision: 32571

Log:
Support FFmpeg LATM decoding.

Modified:
   trunk/etc/codecs.conf
   trunk/libmpdemux/mp_taglists.c

Modified: trunk/etc/codecs.conf
==============================================================================
--- trunk/etc/codecs.conf	Tue Nov  2 14:59:13 2010	(r32570)
+++ trunk/etc/codecs.conf	Tue Nov  2 15:17:05 2010	(r32571)
@@ -4011,6 +4011,13 @@ audiocodec ffdv
   driver ffmpeg
   dll "dvaudio"
 
+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)"
   comment "missing LATM support"

Modified: trunk/libmpdemux/mp_taglists.c
==============================================================================
--- trunk/libmpdemux/mp_taglists.c	Tue Nov  2 14:59:13 2010	(r32570)
+++ trunk/libmpdemux/mp_taglists.c	Tue Nov  2 15:17:05 2010	(r32571)
@@ -62,6 +62,7 @@ const struct AVCodecTag * const mp_wav_t
 
 static const AVCodecTag mp_codecid_override_tags[] = {
     { CODEC_ID_AAC,               MKTAG('M', 'P', '4', 'A')},
+    { CODEC_ID_AAC_LATM,          MKTAG('L', 'A', 'T', 'M')},
     { CODEC_ID_AC3,               0x2000},
     { CODEC_ID_ADPCM_IMA_AMV,     MKTAG('A', 'M', 'V', 'A')},
     { CODEC_ID_DTS,               0x2001},