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

[cehoyos]

Author: cehoyos
Date: Tue Mar  9 15:33:11 2010
New Revision: 30875

Log:
Support SEGA CRI adx codec with demuxer lavf.

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

Modified: trunk/etc/codecs.conf
==============================================================================
--- trunk/etc/codecs.conf	Tue Mar  9 14:19:25 2010	(r30874)
+++ trunk/etc/codecs.conf	Tue Mar  9 15:33:11 2010	(r30875)
@@ -3678,6 +3678,13 @@ audiocodec raatrcmac
   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

Modified: trunk/libmpdemux/mp_taglists.c
==============================================================================
--- trunk/libmpdemux/mp_taglists.c	Tue Mar  9 14:19:25 2010	(r30874)
+++ trunk/libmpdemux/mp_taglists.c	Tue Mar  9 15:33:11 2010	(r30875)
@@ -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')},