Mercurial > mplayer.hg

changeset 32484:4b2173a11f18

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Support FFmpeg LATM decoding.
author cehoyos
date Tue, 02 Nov 2010 14:17:05 +0000
parents 8975b893179e
children 2746e4f916f6
files etc/codecs.conf libmpdemux/mp_taglists.c
diffstat 2 files changed, 8 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/etc/codecs.conf	Tue Nov 02 13:59:13 2010 +0000
+++ b/etc/codecs.conf	Tue Nov 02 14:17:05 2010 +0000
@@ -4011,6 +4011,13 @@
   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"
--- a/libmpdemux/mp_taglists.c	Tue Nov 02 13:59:13 2010 +0000
+++ b/libmpdemux/mp_taglists.c	Tue Nov 02 14:17:05 2010 +0000
@@ -62,6 +62,7 @@
 
 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},