[Mplayer-cvslog] CVS: main/etc codecs.conf,1.65,1.66

[Alex Beregszaszi]

Update of /cvsroot/mplayer/main/etc
In directory mplayer:/var/tmp.root/cvs-serv8088

Modified Files:
	codecs.conf 
Log Message:
3ivx dshow added, ulaw/vbr mp3/cbr mp3 for MOV files added

Index: codecs.conf
===================================================================
RCS file: /cvsroot/mplayer/main/etc/codecs.conf,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- codecs.conf	11 Oct 2001 14:46:09 -0000	1.65
+++ codecs.conf	22 Oct 2001 17:18:21 -0000	1.66
@@ -148,6 +148,8 @@
   info "Motion JPEG"
   status working
   fourcc MJPG
+;  fourcc mjpa  ; MOV files
+;  fourcc mjpb  ; MOV files
   driver vfw
   dll "mcmjpg32.dll"
 ;  dll "m3jpeg32.dll"
@@ -453,6 +455,17 @@
   dll "xa_rle8"
   out BGR32,BGR24,BGR16,BGR15
 
+videocodec 3ivx
+  info "3IVX MPEG4 Codec"
+  status crashing
+  fourcc 3IV1,3ivx
+  driver dshow
+  dll "3ivxdmo.dll"
+  guid 0x0E6772C0, 0xDD80, 0x11D4, 0xB5, 0x8f, 0xA8, 0x6B, 0x66, 0xd0, 0x61, 0x1c
+  out YUY2
+  out UYVY
+  out BGR32,BGR24,BGR16,BGR15
+
 videocodec null
   info "NULL codec (no decoding)"
   status working
@@ -464,6 +477,7 @@
   out UYVY
   out BGR32,BGR24,BGR16,BGR15
 
+
 ;=============================================================================
 ;                   AUDIO CODECS
 ;=============================================================================
@@ -505,6 +519,8 @@
   comment "Optimized to MMX/SSE/3Dnow!"
   format 0x50
   format 0x55
+  format 0x33706d2e  ; ".mp3" VBR MP3 (MOV files)
+  format 0x4400736d  ; "ms\0\x55" CBR MP3 (MOV files)
   driver mp3lib
   dll "mp3lib (mpglib)"
   flags seekable
@@ -562,6 +578,7 @@
   info "uLaw"
   status working
   format 0x7
+  format 0x66515c75  ; "ulaw" (MOV files)
   driver alaw
   dll "ulaw"