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

[compn]

Author: compn
Date: Sat May 17 01:31:05 2008
New Revision: 26792

Log:
add ffmpeg ea maxis xa adpcm audio decoder

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

Modified: trunk/etc/codecs.conf
==============================================================================
--- trunk/etc/codecs.conf	(original)
+++ trunk/etc/codecs.conf	Sat May 17 01:31:05 2008
@@ -2787,6 +2787,13 @@ audiocodec ffadpcmea
   driver ffmpeg
   dll adpcm_ea
 
+audiocodec ffadpcmeamaxis
+  info "FFmpeg EA MAXIS XA ADPCM audio"
+  status working
+  fourcc ADXA ; internal MPlayer FourCC
+  driver ffmpeg
+  dll adpcm_ea_maxis_xa
+
 audiocodec ffxandpcm
   info "FFmpeg XAN DPCM audio"
   comment "only works with libavformat demuxer"

Modified: trunk/libmpdemux/mp_taglists.c
==============================================================================
--- trunk/libmpdemux/mp_taglists.c	(original)
+++ trunk/libmpdemux/mp_taglists.c	Sat May 17 01:31:05 2008
@@ -24,6 +24,7 @@
 static const AVCodecTag mp_wav_tags[] = {
     { CODEC_ID_ADPCM_4XM,         MKTAG('4', 'X', 'M', 'A')},
     { CODEC_ID_ADPCM_EA,          MKTAG('A', 'D', 'E', 'A')},
+    { CODEC_ID_ADPCM_EA_MAXIS_XA, MKTAG('A', 'D', 'X', 'A')},
     { CODEC_ID_ADPCM_IMA_WS,      MKTAG('A', 'I', 'W', 'S')},
     { CODEC_ID_ADPCM_THP,         MKTAG('T', 'H', 'P', 'A')},
     { CODEC_ID_AMR_NB,            MKTAG('n', 'b',   0,   0)},