summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
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