summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authoralex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-04-21 16:10:50 +0000
committeralex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-04-21 16:10:50 +0000
commit0d7e9608e0056e1ebad6bd86a901546e1534f4f3 (patch)
tree9d26aeb5e87cf77cb9501ef27f45db41e0503736 /etc
parentedc3441f2147a0f2250991b49627b5b2e5f48526 (diff)
downloadmpv-0d7e9608e0056e1ebad6bd86a901546e1534f4f3.tar.bz2
mpv-0d7e9608e0056e1ebad6bd86a901546e1534f4f3.tar.xz
added pegasus codecs
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5768 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'etc')
-rw-r--r--etc/codecs.conf34
1 files changed, 32 insertions, 2 deletions
diff --git a/etc/codecs.conf b/etc/codecs.conf
index 13c593b622..20f8558383 100644
--- a/etc/codecs.conf
+++ b/etc/codecs.conf
@@ -371,7 +371,7 @@ videocodec wmv7
; Notes: m3jpeg+mjpeg are mmx optimized. avid is very stable but slow.
; ijpg only decodes jpeg images (no mjpg), and slow. ffmjpeg is buggy.
-videocodec m3jpeg
+videocodec morganvfw
info "Morgan Motion JPEG Codec"
status working
fourcc MJPG
@@ -439,12 +439,41 @@ videocodec morgands
info "Morgan MJPEG"
status crashing
fourcc MJPG mjpg
+ fourcc mjpa,mjpb,mjpg mjpg ; MOV files
+ fourcc dmb1 mjpg ; MJPEG by Matrox Rainbow Runner
driver dshow
dll "m3jpegdec.ax"
guid 0x6988b440, 0x8352, 0x11d3, 0x9b, 0xda, 0xca, 0x86, 0x73, 0x7c, 0x71, 0x68
out YUY2
+ out UYVY
out BGR32,BGR24,BGR16,BGR15
+videocodec pegasusm
+ info "Pegasus Motion JPEG"
+ status buggy
+ fourcc MJPG
+ driver vfw
+; dll "pvmjpg20.dll" ; v2.0
+ dll "pvmjpg21.dll" ; v2.1
+ out BGR24 flip
+
+videocodec pegasusl
+ info "Pegasus Lossless JPEG"
+ status buggy
+ fourcc JPGL
+ fourcc MJPG JPGL
+ driver vfw
+ dll "pvljpg20.dll"
+ out BGR24 flip
+
+videocodec pegasusmwv
+ info "Pegasus Motion Wavelet 2000"
+ status buggy
+ fourcc PVW2
+ driver vfw
+ dll "pvwv220.dll"
+ out BGR24 flip
+
; h263: - I don't know. comments?
videocodec vivo
@@ -825,9 +854,10 @@ videocodec qpeg
videocodec rricm
info "rricm"
status buggy
- fourcc MJPG
+ fourcc dmb1
driver vfw
dll "rricm.dll"
+ out YUY2
out BGR24 flip
; sample videos: http://www.techsmith.com/products/camtasia/examplevideos.asp