From d0b30d7d924e7d8231c3e9cd998bcc142cf92755 Mon Sep 17 00:00:00 2001
From: alex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Sat, 22 Dec 2001 14:40:21 +0000
Subject: added FFmpeg rv10 codec, extended raw codecs, added PIM1 codec (no
 picture :( ) and mpg1,mpg2 fourcc's added to FFmpeg mpg12 decoder

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

(limited to 'etc')

diff --git a/etc/codecs.conf b/etc/codecs.conf
index ff3aac50cb..96e36bb975 100644
--- a/etc/codecs.conf
+++ b/etc/codecs.conf
@@ -216,6 +216,14 @@ videocodec ffh263
   dll h263
   out YV12
 
+videocodec ffrv10
+  info "FFmpeg RV10 decoder"
+  status working
+  fourcc RV10,rv10
+  driver ffmpeg
+  dll rv10
+  out YV12
+
 videocodec ffdivx
   info "FFmpeg DivX ;-) (MS MPEG-4 v3)"
   status working
@@ -245,6 +253,7 @@ videocodec ffmpeg12
   status working
   format 0x10000001  ; mpeg 1
   format 0x10000002  ; mpeg 2
+  fourcc mpg1,mpg2
   driver ffmpeg
   dll "mpegvideo"
   out YV12
@@ -548,6 +557,18 @@ videocodec mss1
 ;  out YUY2
   out BGR32,BGR24,BGR16,BGR15
 
+videocodec pim1
+  info "PIM1"
+  status buggy
+  comment "no picture"
+  fourcc PIM1
+  driver vfw
+  dll "PCLEPIM1.DLL"
+  out BGR24 flip
+;  out I420
+;  out YUY2
+;  out BGR32,BGR24,BGR16,BGR15
+
 videocodec 3ivXqtx
   info "3ivX Delta 3.5"
   status crashing
@@ -631,12 +652,17 @@ videocodec cyuvxa
 ; ============== RAW (uncompressed) and NULL CODECS =========
 
 ; these raw codecs are used mostly by tv input
+; 0x20776172 is used by Quicktime ('raw ')
+; 0x0 is used by AVI
+; YV12,RGB|32,RGB|24.. is created by MPlayer
+
 videocodec rawyv12
   info "RAW YV12"
   comment "pre-postprocessing support"
   status working
   driver raw
   format 0x0
+  format 0x20776172
   fourcc yv12,YV12
   out YV12
 
@@ -645,6 +671,7 @@ videocodec rawyuy2
   status working
   driver raw
   format 0x0
+  format 0x20776172
   fourcc yuy2,YUY2
   out YUY2
 
@@ -653,6 +680,7 @@ videocodec rawuyvy
   status working
   driver raw
   format 0x0
+  format 0x20776172
   fourcc uyvy,UYVY
   out UYVY
 
@@ -661,6 +689,7 @@ videocodec rawrgb32
   status working
   driver raw
   format 0x0
+  format 0x20776172
   format 0x52474220
   out RGB32
 
@@ -669,6 +698,7 @@ videocodec rawrgb24
   status working
   driver raw
   format 0x0
+  format 0x20776172
   format 0x52474218
   out RGB24
 
@@ -677,6 +707,7 @@ videocodec rawrgb16
   status working
   driver raw
   format 0x0
+  format 0x20776172
   format 0x52474210
   out RGB16
 
@@ -685,6 +716,7 @@ videocodec rawbgr24
   status working
   driver raw
   format 0x0
+  format 0x20776172
   out BGR24 flip
 
 videocodec rawbgr15
@@ -692,6 +724,7 @@ videocodec rawbgr15
   status working
   driver raw
   format 0x0
+  format 0x20776172
   out BGR15 flip
 
 videocodec null
@@ -911,5 +944,6 @@ audiocodec g72x
   status untested
   comment "does not work yet - just noise :("
   format 0x111	    ; vivo g.723
+  format 0x112	    ; vivo siren
   driver g72x
   dll "g72x.c"
-- 
cgit v1.2.3