[Mplayer-cvslog] CVS: main/etc codecs.conf,1.109,1.110

[Mike Melanson]

Update of /cvsroot/mplayer/main/etc
In directory mplayer:/var/tmp.root/cvs-serv11493/etc

Modified Files:
	codecs.conf 
Log Message:
implemented open source MS ADPCM decoder


Index: codecs.conf
===================================================================
RCS file: /cvsroot/mplayer/main/etc/codecs.conf,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -r1.109 -r1.110
--- codecs.conf	26 Dec 2001 14:24:57 -0000	1.109
+++ codecs.conf	27 Dec 2001 05:09:43 -0000	1.110
@@ -315,8 +315,13 @@
   status working
   format 0x11
   format 0x34616d69  ; "ima4" (MOV files)
-  driver adpcm
-  dll "imaadpcm"
+  driver imaadpcm
+
+audiocodec msadpcm
+  info "MS ADPCM"
+  status working
+  format 0x2
+  driver msadpcm
 
 ; =============== WINDOWS DLL's ==============
 
@@ -792,12 +797,12 @@
   dll "divxa32.acm"
   cpuflags mmx
 
-audiocodec msadpcm
-  info "MS ADPCM"
-  status working
-  format 0x2
-  driver acm
-  dll "msadp32.acm"
+;audiocodec msadpcm
+;  info "MS ADPCM"
+;  status working
+;  format 0x2
+;  driver acm
+;  dll "msadp32.acm"
 
 audiocodec mp3
   info "MPEG layer-2, layer-3"
@@ -947,14 +952,6 @@
 ; acm codec doesn't work, haven't tried zorannt dshow codec
 ;  driver acm
 ;  dll "vorbis.acm"
-
-audiocodec ima4
-  info "IMA4:1"
-  status working
-  comment "MONO only"
-  format 0x34616d69  ; "ima4" (MOV files)
-  driver ima4
-  dll "ima4.c"
 
 audiocodec vivoaudio
   info "Vivo G.723/Siren Audio Codec"