summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorUoti Urpala <uau@glyph.nonexistent.invalid>2010-03-10 01:25:15 +0200
committerUoti Urpala <uau@glyph.nonexistent.invalid>2010-03-10 01:25:15 +0200
commitacdce0176ae3722ad38a23aae0cf0bf03a82f9c4 (patch)
tree57a30f1d44ea193586d5723faac7ffb96a3a73aa /etc
parentef3ef5e218588b5f68b427729a3c2c1a8083e499 (diff)
parent5a2289137f43501281dba83fe98b5f67be63f9ef (diff)
downloadmpv-acdce0176ae3722ad38a23aae0cf0bf03a82f9c4.tar.bz2
mpv-acdce0176ae3722ad38a23aae0cf0bf03a82f9c4.tar.xz
Merge svn changes up to r30732
Diffstat (limited to 'etc')
-rw-r--r--etc/codecs.conf11
1 files changed, 11 insertions, 0 deletions
diff --git a/etc/codecs.conf b/etc/codecs.conf
index e61d41e440..f78c2ea32c 100644
--- a/etc/codecs.conf
+++ b/etc/codecs.conf
@@ -19,6 +19,7 @@ videocodec ffbinkvideo
driver ffmpeg
dll binkvideo
out YV12
+ out 420A
videocodec ffcdgraphics
info "FFmpeg CD-Graphics"
@@ -4537,6 +4538,16 @@ audiocodec lhacm
driver acm
dll "lhacm.acm"
+audiocodec lhacm2
+ info "Voxware AC aka Lernout & Hauspie CELP and CBS codecs"
+ status working
+ format 0x70
+ format 0x71
+ format 0x72
+ format 0x73
+ driver acm
+ dll "lhacm2.acm" ; aka lhacm.acm md5sum 4585780a8eb71d86df64553b34ba8f79
+
audiocodec pscelp
info "Philips Speech Processing CELP"
status working