summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authoralex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-04-21 16:37:28 +0000
committeralex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-04-21 16:37:28 +0000
commit9558198a9c44d0dfae1a18e430b44e0c8b0ad2da (patch)
tree190270fdd278667e10563db04fa9dcf643985f68 /etc
parenta23d456d60203205b817ba3105a30a97ca307373 (diff)
downloadmpv-9558198a9c44d0dfae1a18e430b44e0c8b0ad2da.tar.bz2
mpv-9558198a9c44d0dfae1a18e430b44e0c8b0ad2da.tar.xz
added UB Video MPEG 4
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5772 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'etc')
-rw-r--r--etc/codecs.conf14
1 files changed, 12 insertions, 2 deletions
diff --git a/etc/codecs.conf b/etc/codecs.conf
index 20f8558383..a05263d5e9 100644
--- a/etc/codecs.conf
+++ b/etc/codecs.conf
@@ -367,11 +367,21 @@ videocodec wmv7
out YUY2
out BGR32,BGR24,BGR16,BGR15
+videocodec ubmp4
+ info "UB Video MPEG 4"
+ status buggy
+ fourcc UMP4
+ driver vfw
+ dll "ubvmp4d.dll"
+ out I420
+ out UYVY
+
+
; mjpegs:
; 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 morganvfw
+videocodec m3jpeg
info "Morgan Motion JPEG Codec"
status working
fourcc MJPG
@@ -435,7 +445,7 @@ videocodec ffmjpeg
out YUY2 ; queryed (conversion from yuv422p)
out YV12,I420,IYUV
-videocodec morgands
+videocodec m3jpegds
info "Morgan MJPEG"
status crashing
fourcc MJPG mjpg