[Mplayer-cvslog] CVS: main/DOCS codecs.conf,1.48,1.49

[Arpi of Ize]

Update of /cvsroot/mplayer/main/DOCS
In directory mplayer:/var/tmp.root/cvs-serv13757

Modified Files:
	codecs.conf 
Log Message:
new ffmpeg codecs added

Index: codecs.conf
===================================================================
RCS file: /cvsroot/mplayer/main/DOCS/codecs.conf,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- codecs.conf	1 Aug 2001 09:14:02 -0000	1.48
+++ codecs.conf	6 Aug 2001 23:57:18 -0000	1.49
@@ -113,8 +113,54 @@
   out UYVY
   out BGR32,BGR24,BGR16,BGR15
 
+videocodec i263
+  info "I263"
+  status working
+  fourcc I263,i263,I420,i420
+  driver vfw
+  dll "i263_32.drv"
+;  out I420
+  out YUY2
+  out BGR32,BGR24,BGR15
+
+videocodec mjpeg
+  info "Motion JPEG"
+  status working
+  fourcc MJPG
+  driver vfw
+  dll "mcmjpg32.dll"
+;  dll "m3jpeg32.dll"
+  out YUY2
+  out UYVY
+  out BGR32,BGR24,BGR15
+
 ; =============== FFMPEG MPEG CODECS =========================
 
+videocodec ffmjpeg
+  info "FFmpeg MJPEG decoder"
+  status working
+  fourcc MJPG,mjpg
+  driver ffmpeg
+  dll mjpeg
+;  out YUY2
+  out YV12
+
+videocodec ffi263
+  info "FFmpeg I263 decoder"
+  status working
+  fourcc I263,i263
+  driver ffmpeg
+  dll h263i
+  out YV12
+
+videocodec ffh263
+  info "FFmpeg H263+ decoder"
+  status untested
+  fourcc H263,U263
+  driver ffmpeg
+  dll h263
+  out YV12
+
 videocodec ffdivx
   info "FFmpeg DivX ;-) (MS MPEG-4 v3)"
   status working
@@ -144,7 +190,7 @@
   status working
   format 0x10000001
   driver ffmpeg
-  dll "mpeg1video"
+  dll "mpegvideo"
   out YV12
 
 
@@ -217,27 +263,6 @@
   driver vfw
   dll "ativcr2.dll"
   out YUY2
-  out BGR32,BGR24,BGR15
-
-videocodec i263
-  info "I263"
-  status working
-  fourcc I263,i263,I420,i420
-  driver vfw
-  dll "i263_32.drv"
-;  out I420
-  out YUY2
-  out BGR32,BGR24,BGR15
-
-videocodec mjpeg
-  info "Motion JPEG"
-  status working
-  fourcc MJPG
-  driver vfw
-  dll "mcmjpg32.dll"
-;  dll "m3jpeg32.dll"
-  out YUY2
-  out UYVY
   out BGR32,BGR24,BGR15
 
 videocodec wmv7