diff options
author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-01-25 15:04:07 +0200 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-01-25 15:07:30 +0200 |
commit | 69fe2522f8c2a04eda112eee6319ca2e85d7038b (patch) | |
tree | 83a8b19997e621309344ca1f3997a48886ef0944 /etc | |
parent | 9436e0452fad48e671d7320cb18c588655f3d230 (diff) | |
parent | 1cda8b002fb19c3da14760fe1f9fc76992a05c29 (diff) | |
download | mpv-69fe2522f8c2a04eda112eee6319ca2e85d7038b.tar.bz2 mpv-69fe2522f8c2a04eda112eee6319ca2e85d7038b.tar.xz |
Merge svn changes up to r30301
Diffstat (limited to 'etc')
-rw-r--r-- | etc/codecs.conf | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/etc/codecs.conf b/etc/codecs.conf index 3b065b7e05..0f821628d5 100644 --- a/etc/codecs.conf +++ b/etc/codecs.conf @@ -1999,7 +1999,7 @@ videocodec smv2vfw videocodec cfhdvfw status working info "CineForm HD" - comment "set registry keys for half-res decoding" + comment "windows only" ; set registry keys for half-res decoding status working fourcc CFHD driver vfw @@ -3488,6 +3488,14 @@ audiocodec ffatrc driver ffmpeg dll "atrac3" +audiocodec ffsipr + info "FFmpeg Sipr/Acelp.net audio" + status buggy ; missing 16k support + format 0x72706973 ; "sipr" + format 0x130 ; acelp.net + driver ffmpeg + dll "sipr" + audiocodec ra144 info "RealAudio 1.0" status working |