summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authoralbeu <albeu@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-07-10 20:56:57 +0000
committeralbeu <albeu@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-07-10 20:56:57 +0000
commit5319a8118ad70cc38415cd3485890f3aab90b486 (patch)
treec9a479899003db0a1b916a5eb06aba6b57d86253 /etc
parent4e6a6f9a3125ca68d048b4952db90d7de7043cd6 (diff)
downloadmpv-5319a8118ad70cc38415cd3485890f3aab90b486.tar.bz2
mpv-5319a8118ad70cc38415cd3485890f3aab90b486.tar.xz
Support for Xvid using their new api. If divx4 compatiblity is disabeled
in xvid it can be used along with divx4. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6702 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'etc')
-rw-r--r--etc/codecs.conf14
1 files changed, 14 insertions, 0 deletions
diff --git a/etc/codecs.conf b/etc/codecs.conf
index cb022fb4f4..af18da9311 100644
--- a/etc/codecs.conf
+++ b/etc/codecs.conf
@@ -268,6 +268,20 @@ videocodec ffodivx
dll mpeg4 ;opendivx
out YV12,I420,IYUV
+videocodec xvid
+ info "Xvid (MPEG-4)"
+ status working
+ fourcc DIVX,divx
+ fourcc xvid,XVID,XviD
+ format 0x4
+ driver xvid
+ out YV12
+ out I420
+ out YUY2
+ out UYVY
+ out YVYU
+ out BGR32,BGR24,BGR16,BGR15
+
; divx4 does direct render, and is native on linux
videocodec odivx