[Mplayer-cvslog] CVS: main/etc codecs.conf,1.83,1.84

[Arpi of Ize]

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

Modified Files:
	codecs.conf 
Log Message:
morgan mjpeg added

Index: codecs.conf
===================================================================
RCS file: /cvsroot/mplayer/main/etc/codecs.conf,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- codecs.conf	11 Nov 2001 13:39:10 -0000	1.83
+++ codecs.conf	13 Nov 2001 21:00:40 -0000	1.84
@@ -153,19 +153,28 @@
   out YUY2
   out BGR32,BGR24,BGR15
 
+videocodec m3jpeg
+  info "Morgan Motion JPEG Codec"
+  status working
+  fourcc MJPG
+  fourcc mjpa,mjpb,mjpg MJPG  ; MOV files
+  driver vfw
+  dll "m3jpeg32.dll"
+  out YUY2
+  out UYVY
+  out BGR32,BGR24,BGR15
+
 videocodec mjpeg
-  info "Motion JPEG"
+  info "MainConcept Motion JPEG"
   status working
   fourcc MJPG
   fourcc mjpa,mjpb,mjpg MJPG  ; MOV files
   driver vfw
   dll "mcmjpg32.dll"
-;  dll "m3jpeg32.dll"
   out YUY2
   out UYVY
   out BGR32,BGR24,BGR15
 
-
 ; =============== FFMPEG MPEG CODECS =========================
 
 videocodec ffmjpeg
@@ -264,7 +273,7 @@
   driver dshow
   dll "ir50_32.dll"
   guid 0x30355649, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71
-;  out YV12,I420
+  out YV12
   out YUY2
   out BGR32,BGR24,BGR16,BGR15