summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorarpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2001-12-28 20:52:51 +0000
committerarpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2001-12-28 20:52:51 +0000
commitb2a574d55a0575ff26a550d72b87fbfe9a96e02f (patch)
tree1a8a69821e0ef6e25806b854d6306763f862d5ae /etc
parentc69f516fb8bd22350e45d122960e8314b815d6a8 (diff)
downloadmpv-b2a574d55a0575ff26a550d72b87fbfe9a96e02f.tar.bz2
mpv-b2a574d55a0575ff26a550d72b87fbfe9a96e02f.tar.xz
msadpcm acm re-enabled. don't remove codecs!
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@3852 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'etc')
-rw-r--r--etc/codecs.conf12
1 files changed, 6 insertions, 6 deletions
diff --git a/etc/codecs.conf b/etc/codecs.conf
index 9739a64d20..c847cc0a67 100644
--- a/etc/codecs.conf
+++ b/etc/codecs.conf
@@ -810,12 +810,12 @@ audiocodec divx
dll "divxa32.acm"
cpuflags mmx
-;audiocodec msadpcm
-; info "MS ADPCM"
-; status working
-; format 0x2
-; driver acm
-; dll "msadp32.acm"
+audiocodec msadpcmacm
+ info "MS ADPCM"
+ status working
+ format 0x2
+ driver acm
+ dll "msadp32.acm"
audiocodec mp3
info "MPEG layer-2, layer-3"