summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authormelanson <melanson@b3059339-0415-0410-9bf9-f77b7e298cf2>2001-12-27 05:09:43 +0000
committermelanson <melanson@b3059339-0415-0410-9bf9-f77b7e298cf2>2001-12-27 05:09:43 +0000
commita527e0f5080d801e87faf29960ee3f5cfc223e96 (patch)
tree9e35f7ec8b89b59d8750108413afd5c4737474bc /etc
parent5194d8791e30f968e569b6b452f9b4374298a539 (diff)
downloadmpv-a527e0f5080d801e87faf29960ee3f5cfc223e96.tar.bz2
mpv-a527e0f5080d801e87faf29960ee3f5cfc223e96.tar.xz
implemented open source MS ADPCM decoder
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@3788 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'etc')
-rw-r--r--etc/codecs.conf29
1 files changed, 13 insertions, 16 deletions
diff --git a/etc/codecs.conf b/etc/codecs.conf
index e52ef777b7..6fe7a3ce61 100644
--- a/etc/codecs.conf
+++ b/etc/codecs.conf
@@ -315,8 +315,13 @@ audiocodec imaadpcm
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 @@ audiocodec divx
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"
@@ -948,14 +953,6 @@ audiocodec vorbis
; 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"
status working