diff options
author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-09 23:09:46 +0200 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-09 23:09:46 +0200 |
commit | 8365d174b69518f0acbc6540bd2bb817490e13f4 (patch) | |
tree | fc86d4ba642e9e83b0d05b942b366cc540c4395b /etc/codecs.conf | |
parent | 7fc3bb2a88dd5603b92a912fd34f834813381941 (diff) | |
parent | 3e5d40ff2e9a45cb4f55f23b787f32bf359bd3d5 (diff) | |
download | mpv-8365d174b69518f0acbc6540bd2bb817490e13f4.tar.bz2 mpv-8365d174b69518f0acbc6540bd2bb817490e13f4.tar.xz |
Merge svn changes up to r30557
Diffstat (limited to 'etc/codecs.conf')
-rw-r--r-- | etc/codecs.conf | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/etc/codecs.conf b/etc/codecs.conf index 4a05f15190..c3f2c6987b 100644 --- a/etc/codecs.conf +++ b/etc/codecs.conf @@ -4135,6 +4135,7 @@ audiocodec msgsm format 0x31 format 0x32 format 0x204D5347 + format 0x1500 fourcc agsm driver msgsm @@ -4454,6 +4455,7 @@ audiocodec fftruespeech info "FFmpeg TrueSpeech" status working format 0x22 + format 0x1501 driver ffmpeg dll "truespeech" @@ -4464,6 +4466,20 @@ audiocodec truespeech driver acm dll "tssoft32.acm" ; need also tsd32.dll +audiocodec netspeakgsm + info "NetSpeak GSM" + status working + format 0x1500 + driver acm + dll "nsgsm32.acm" + +audiocodec netspeakts + info "NetSpeak TrueSpeech" + status working + format 0x1501 + driver acm + dll "nstsp32.acm" + ; rt32dcmp.dll needed too audiocodec voxwarert24 info "VoxWare RT24 speech codec" |