# HG changeset patch
# User arpi
# Date 1005685240 0
# Node ID c1298484a2d0acbf6a6fc424f15e539a25b65a52
# Parent  12a0be665dfd8e9522ef98e2890d126973bcbcca
morgan mjpeg added

diff -r 12a0be665dfd -r c1298484a2d0 etc/codecs.conf
--- a/etc/codecs.conf	Tue Nov 13 20:39:27 2001 +0000
+++ b/etc/codecs.conf	Tue Nov 13 21:00:40 2001 +0000
@@ -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