# HG changeset patch
# User reimar
# Date 1289058590 0
# Node ID 7b03b3c941c8a2d23b3f87a750cf81257e9a623b
# Parent  5376d7337fcf469d10ae60ea4b8e3fe01a962744
Use only one fourcc for LATM.

diff -r 5376d7337fcf -r 7b03b3c941c8 etc/codecs.conf
--- 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
 
diff -r 5376d7337fcf -r 7b03b3c941c8 libmpdemux/mp_taglists.c
--- 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},