diff options
author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-01-08 02:44:37 +0200 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-01-08 02:44:37 +0200 |
commit | 819b8f08a2d2223a9a4e9a3c65b05b3a3bfaf781 (patch) | |
tree | f6d6d1e944e5b44ac1d26adcecc4379cd9dc4806 /etc | |
parent | 3488fcafe6709337b25a742999a03d04d561f419 (diff) | |
parent | 3f1a03feb15344188a8213854246d42db38314ac (diff) | |
download | mpv-819b8f08a2d2223a9a4e9a3c65b05b3a3bfaf781.tar.bz2 mpv-819b8f08a2d2223a9a4e9a3c65b05b3a3bfaf781.tar.xz |
Merge svn changes up to r30236
Diffstat (limited to 'etc')
-rw-r--r-- | etc/codecs.conf | 50 |
1 files changed, 49 insertions, 1 deletions
diff --git a/etc/codecs.conf b/etc/codecs.conf index c0d88cc42c..74043f6aff 100644 --- a/etc/codecs.conf +++ b/etc/codecs.conf @@ -1300,7 +1300,7 @@ videocodec ffmjpeg fourcc MVJP ; Midvid JPEG Video Codec fourcc IJLV ; Intel JPEG Library Video Codec fourcc avi1,avi2 - fourcc MTSJ + fourcc MTSJ,ZJPG driver ffmpeg dll mjpeg out 444P @@ -1947,6 +1947,22 @@ videocodec psiv dll "psiv.dll" out BGR32,BGR24 query,flip +videocodec midivid1 + info "http://www.midivid.com/codec/download.html" + status working + fourcc MVLZ + driver vfw + dll "MLZCodec.dll" + out BGR24,BGR16 flip + +videocodec midivid2 + info "http://www.midivid.com/codec/download.html" + status working + fourcc MVDV + driver vfw + dll "MVCodec.dll" + out BGR24 flip + videocodec midivid3 info "www.midivid.com/codec/mv3codec.html" status working @@ -2192,6 +2208,14 @@ videocodec slifvfw dll "slif.dll" out RGB32 flip +videocodec blox + info "Jan Jezabeks BLOX MPEG Codec" + status working + fourcc BLOX + driver vfw + dll "blox.dll" + out YUY2 + videocodec cjpg info "Creative Labs Video Blaster Webcam" comment "sequential jpeg files?" @@ -2399,6 +2423,30 @@ videocodec smsvvfw dll "wv32vfw.dll" out BGR24 flip +videocodec adv601 + info "Analog Devices Wavelet Codec" + status working + fourcc ADV1 + driver vfw + dll "ADV601.dll" + out BGR24 flip + +videocodec advwavelet + info "waveletvideo.freeservers.com" + status working + fourcc ADV1 + driver vfw + dll "wavelet.dll" + out BGR24 flip + +videocodec loronixwavlet + info "loronix wavelet" + status untested + fourcc ADV1 + driver vfw + dll "wavlor.dll" + out BGR24 + videocodec foxmotion info "fox motion video" status working |