From 2c45e52d3c3ba886ce249ae2d1bfef610421656f Mon Sep 17 00:00:00 2001
From: alex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Sun, 21 Apr 2002 09:20:01 +0000
Subject: ATI VCR2 working (YV12) added ATI VCR1 and rricm (matrox marvel
 mjpeg)

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5757 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 etc/codecs.conf | 32 ++++++++++++++++++++++++--------
 1 file changed, 24 insertions(+), 8 deletions(-)

(limited to 'etc/codecs.conf')

diff --git a/etc/codecs.conf b/etc/codecs.conf
index 904613d3d0..5b7bc693f1 100644
--- a/etc/codecs.conf
+++ b/etc/codecs.conf
@@ -720,6 +720,15 @@ videocodec ucod
   out UYVY
   out BGR32,BGR24,BGR15 flip
 
+videocodec vcr2
+  info "ATI VCR-2"
+  status working
+  fourcc VCR2
+  driver vfw
+  dll "ativcr2.dll"
+  out YV12
+  out BGR24
+
 videocodec CJPG
   info "CJPG"
   status untested
@@ -778,15 +787,13 @@ videocodec alaris
 
 ; non-working codecs:
 
-videocodec vcr2
-  info "ATI VCR-2"
-  status crashing
-  comment "segfault"
-  fourcc VCR2
+videocodec vcr1
+  info "ATI VCR-1"
+  status buggy
+  fourcc VCR1
   driver vfw
-  dll "ativcr2.dll"
-  out YUY2
-  out BGR32,BGR24,BGR15
+  dll "ativcr1.dll"
+  out RGB24 flip
 
 videocodec tm20
   info "TrueMotion 2.0"
@@ -815,12 +822,21 @@ videocodec pim1
 videocodec qpeg
   info "Q-Team's QPEG (www.q-team.de)"
   status buggy
+  comment "BGR8 only!"
   fourcc Q1.0
   fourcc Q1.1
   driver vfw
   dll "qpeg32.dll"
   out BGR8 flip
 
+videocodec rricm
+  info "rricm"
+  status buggy
+  fourcc MJPG
+  driver vfw
+  dll "rricm.dll"
+  out BGR24 flip
+
 ; raw formats:  (now RGB formats are autodetected)
 
 ; these raw codecs are used mostly by tv input
-- 
cgit v1.2.3