diff options
author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-01-25 14:34:56 +0200 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-01-25 14:34:56 +0200 |
commit | 47a04d40f35a02a64f8410ee684affc5f0af894f (patch) | |
tree | a32a4f9d4901a6a1ca1a8a763627cd795ab5fb3d /etc | |
parent | ffc3db22395b2a505e2f9ef6e805650c9b375731 (diff) | |
parent | a91c19964de606c8002531cbb87aa6de3d89508f (diff) | |
download | mpv-47a04d40f35a02a64f8410ee684affc5f0af894f.tar.bz2 mpv-47a04d40f35a02a64f8410ee684affc5f0af894f.tar.xz |
Merge svn changes up to r30250
Diffstat (limited to 'etc')
-rw-r--r-- | etc/codecs.conf | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/etc/codecs.conf b/etc/codecs.conf index 74043f6aff..3b065b7e05 100644 --- a/etc/codecs.conf +++ b/etc/codecs.conf @@ -1996,6 +1996,16 @@ videocodec smv2vfw dll "smv2vfw.dll" out BGR32,BGR24,BGR8,RGB32,RGB24,RGB8 flip +videocodec cfhdvfw + status working + info "CineForm HD" + comment "set registry keys for half-res decoding" + status working + fourcc CFHD + driver vfw + dll "cinevfw.dll" + out BGR32 + videocodec canopushq status working info "Canopus HQ Codec" @@ -3414,7 +3424,7 @@ audiocodec qdmc audiocodec ffqclp info "FFmpeg QCLP audio" - status buggy + status working format 0x706C6351 ; "Qclp" format 0x70637173 ; "sqcp" format 0x716C6351 ; "Qclq" |