Mercurial > mplayer.hg

changeset 32497:7b03b3c941c8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use only one fourcc for LATM.
author reimar
date Sat, 06 Nov 2010 15:49:50 +0000
parents 5376d7337fcf
children 95cc44996d5d
files etc/codecs.conf libmpdemux/mp_taglists.c
diffstat 2 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/etc/codecs.conf	Sat Nov 06 15:48:21 2010 +0000
+++ b/etc/codecs.conf	Sat Nov 06 15:49:50 2010 +0000
@@ -4014,7 +4014,7 @@
 audiocodec fflatm
   info "FFmpeg AAC in LATM"
   status buggy
-  fourcc "LATM" ; internal MPlayer FourCC
+  fourcc MP4L ; internal MPlayer FourCC
   driver ffmpeg
   dll aac_latm
 
--- a/libmpdemux/mp_taglists.c	Sat Nov 06 15:48:21 2010 +0000
+++ b/libmpdemux/mp_taglists.c	Sat Nov 06 15:49:50 2010 +0000
@@ -62,7 +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_AAC_LATM,          MKTAG('M', 'P', '4', 'L')},
     { CODEC_ID_AC3,               0x2000},
     { CODEC_ID_ADPCM_IMA_AMV,     MKTAG('A', 'M', 'V', 'A')},
     { CODEC_ID_DTS,               0x2001},