summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorarpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2001-12-21 16:40:28 +0000
committerarpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2001-12-21 16:40:28 +0000
commit5281a3219248a8e5fdb10045d99583272a3dfc47 (patch)
tree42ef97614675e1da03a0572f2c28f024feb5b074 /etc
parentf7eadf849c6884e870b15d5b0a4799f72f2b6ce4 (diff)
downloadmpv-5281a3219248a8e5fdb10045d99583272a3dfc47.tar.bz2
mpv-5281a3219248a8e5fdb10045d99583272a3dfc47.tar.xz
native CVID codec added, order of native and vfw codecs changed
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@3645 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'etc')
-rw-r--r--etc/codecs.conf61
1 files changed, 34 insertions, 27 deletions
diff --git a/etc/codecs.conf b/etc/codecs.conf
index 990b009e7e..be16973005 100644
--- a/etc/codecs.conf
+++ b/etc/codecs.conf
@@ -259,6 +259,38 @@ videocodec mpegpes
dll "libmpeg2"
out MPES
+; ============== MPLAYER OPENSOURCE CODECS =========
+
+videocodec cvid
+ info "Cinepak Video (native codec)"
+ status working
+ fourcc cvid,CVID
+ driver cinepak
+ out BGR32,BGR24
+
+videocodec msrle
+ info "M$ RLE8"
+ status working
+ format 0x1
+ driver rle
+ dll "xa_rle8"
+ out BGR32,BGR24,BGR16,BGR15
+
+videocodec fli
+ info "Autodesk FLI/FLC Animation"
+ status working
+ fourcc FLIC
+ driver fli
+ out BGR24
+
+videocodec video1
+ info "Microsoft Video 1"
+ status working
+ fourcc cram,CRAM
+ fourcc msvc,MSVC
+ fourcc wham,WHAM
+ driver msvidc
+ out BGR32,BGR24
; =============== WINDOWS DLL's ==============
@@ -316,7 +348,7 @@ videocodec indeo3
out BGR24,BGR15 flip
cpuflags mmx
-videocodec cvid
+videocodec cvidvfw
info "Cinepak Video"
status working
fourcc cvid
@@ -595,32 +627,7 @@ videocodec cyuvxa
dll "vid_cyuv.xa"
out YV12,IYUV,I420
-
-; ============== MPLAYER OPENSOURCE CODECS =========
-
-videocodec msrle
- info "M$ RLE8"
- status working
- format 0x1
- driver rle
- dll "xa_rle8"
- out BGR32,BGR24,BGR16,BGR15
-
-videocodec fli
- info "Autodesk FLI/FLC Animation"
- status buggy
- fourcc FLIC
- driver fli
- out BGR24
-
-videocodec video1
- info "Microsoft Video 1"
- status working
- fourcc cram,CRAM
- fourcc msvc,MSVC
- fourcc wham,WHAM
- driver msvidc
- out BGR32,BGR24
+; ============== RAW (uncompressed) and NULL CODECS =========
; these raw codecs are used mostly by tv input
videocodec rawyv12