From 3ea9517367737804bdce10cea1206f56eeb0b868 Mon Sep 17 00:00:00 2001
From: compn <compn@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Fri, 16 May 2008 23:31:05 +0000
Subject: add ffmpeg ea maxis xa adpcm audio decoder

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26792 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 etc/codecs.conf          | 7 +++++++
 libmpdemux/mp_taglists.c | 1 +
 2 files changed, 8 insertions(+)

diff --git a/etc/codecs.conf b/etc/codecs.conf
index 6a4239b1a4..a26016944e 100644
--- a/etc/codecs.conf
+++ b/etc/codecs.conf
@@ -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"
diff --git a/libmpdemux/mp_taglists.c b/libmpdemux/mp_taglists.c
index 5bcf739188..44d3ed028b 100644
--- a/libmpdemux/mp_taglists.c
+++ b/libmpdemux/mp_taglists.c
@@ -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)},
-- 
cgit v1.2.3