# HG changeset patch
# User cehoyos
# Date 1268145191 0
# Node ID 0336ed6ed3c6c2f43acc3756d092d6f6d648492c
# Parent  9e81c17f6e7352e43a2c70f1b3616005ea66e998
Support SEGA CRI adx codec with demuxer lavf.

diff -r 9e81c17f6e73 -r 0336ed6ed3c6 etc/codecs.conf
--- a/etc/codecs.conf	Tue Mar 09 13:19:25 2010 +0000
+++ b/etc/codecs.conf	Tue Mar 09 14:33:11 2010 +0000
@@ -3678,6 +3678,13 @@
   driver realaud
   dll "atrc.bundle/Contents/MacOS/atrc"
 
+audiocodec ffadpcmadx
+  info "FFmpeg SEGA CRI adx codec"
+  status working
+  fourcc Sadx ; internal MPlayer FourCC
+  driver ffmpeg
+  dll adpcm_adx
+
 audiocodec ffadpcmimaamv
   info "FFmpeg AMV IMA ADPCM audio"
   status working
diff -r 9e81c17f6e73 -r 0336ed6ed3c6 libmpdemux/mp_taglists.c
--- a/libmpdemux/mp_taglists.c	Tue Mar 09 13:19:25 2010 +0000
+++ b/libmpdemux/mp_taglists.c	Tue Mar 09 14:33:11 2010 +0000
@@ -23,6 +23,7 @@
 #include "libavformat/riff.h"
 
 static const AVCodecTag mp_wav_tags[] = {
+    { CODEC_ID_ADPCM_ADX,         MKTAG('S', 'a', 'd', 'x')},
     { 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')},