summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authoralex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-04-21 10:03:26 +0000
committeralex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-04-21 10:03:26 +0000
commit7b924b85eac0b4873f9ffc1fd60880c4ed6a7ebf (patch)
tree19c8dc19cd9dec4206de584b665d7eee472ef1ff /etc
parent2c45e52d3c3ba886ce249ae2d1bfef610421656f (diff)
downloadmpv-7b924b85eac0b4873f9ffc1fd60880c4ed6a7ebf.tar.bz2
mpv-7b924b85eac0b4873f9ffc1fd60880c4ed6a7ebf.tar.xz
removed some silly comments and added lhacm audio - working
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5758 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'etc')
-rw-r--r--etc/codecs.conf19
1 files changed, 11 insertions, 8 deletions
diff --git a/etc/codecs.conf b/etc/codecs.conf
index 5b7bc693f1..70e9df34f0 100644
--- a/etc/codecs.conf
+++ b/etc/codecs.conf
@@ -418,7 +418,6 @@ videocodec LEAD
videocodec ijpg
info "IJPG codec"
status working
- comment "Hm."
fourcc ijpg,IJPG
fourcc jpeg ; MOV Photo Jpeg
fourcc AVRn,AVDJ ; AVID
@@ -559,7 +558,6 @@ videocodec indeo5
videocodec indeo4
info "Intel Indeo 4.1"
status working
-; comment "upside-down"
fourcc IV41,iv41
driver vfw
dll "ir41_32.dll"
@@ -671,7 +669,6 @@ videocodec vp3
videocodec mwv1
info "Motion Wavelets"
status working
- comment "no yuv, flip requires"
fourcc MWV1
driver vfw
dll "icmw_32.dll"
@@ -682,22 +679,18 @@ videocodec mwv1
videocodec asv2
info "ASUS V2"
status working
- comment "rgb upside down, yuv ok"
fourcc ASV2
driver vfw
dll "asusasv2.dll"
-; out YVYU
out UYVY
out BGR32,BGR24,BGR15 flip
videocodec asv1
info "ASUS V1"
status working
- comment "rgb upside down, yuv ok"
fourcc ASV1
driver vfw
dll "asusasvd.dll"
-; out YVYU
out UYVY
out BGR32,BGR24,BGR15 flip
@@ -1205,7 +1198,7 @@ audiocodec ALF2
dll "alf2cd.acm"
audiocodec truespeech
- info "Truespeech"
+ info "DSP Group TrueSpeech(TM)"
status working
format 0x22
driver acm
@@ -1218,3 +1211,13 @@ audiocodec voxwarert24
format 0x181c
driver acm
dll "nsrt2432.acm"
+
+audiocodec lhacm
+ info "Lernout & Hauspie CELP and SBC codecs"
+ status working
+ format 0x1101 ; CELP
+ format 0x1102 ; SBC
+ format 0x1103 ; SBC
+ format 0x1104 ; SBC
+ driver acm
+ dll "lhacm.acm"