From 5319a8118ad70cc38415cd3485890f3aab90b486 Mon Sep 17 00:00:00 2001
From: albeu <albeu@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Wed, 10 Jul 2002 20:56:57 +0000
Subject: 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
---
 etc/codecs.conf | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

(limited to 'etc')

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
-- 
cgit v1.2.3