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

[reimar]

Author: reimar
Date: Sat Nov  6 16:49:50 2010
New Revision: 32584

Log:
Use only one fourcc for LATM.

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

Modified: trunk/etc/codecs.conf
==============================================================================
--- trunk/etc/codecs.conf	Sat Nov  6 16:48:21 2010	(r32583)
+++ trunk/etc/codecs.conf	Sat Nov  6 16:49:50 2010	(r32584)
@@ -4014,7 +4014,7 @@ audiocodec ffdv
 audiocodec fflatm
   info "FFmpeg AAC in LATM"
   status buggy
-  fourcc "LATM" ; internal MPlayer FourCC
+  fourcc MP4L ; internal MPlayer FourCC
   driver ffmpeg
   dll aac_latm
 

Modified: trunk/libmpdemux/mp_taglists.c
==============================================================================
--- trunk/libmpdemux/mp_taglists.c	Sat Nov  6 16:48:21 2010	(r32583)
+++ trunk/libmpdemux/mp_taglists.c	Sat Nov  6 16:49:50 2010	(r32584)
@@ -62,7 +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_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},