[Mplayer-cvslog] CVS: main/etc codecs.conf,1.209,1.210

[Arpi of Ize]

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

Modified Files:
	codecs.conf 
Log Message:
mjpeg codecs reordered - now it plays almost everything by default


Index: codecs.conf
===================================================================
RCS file: /cvsroot/mplayer/main/etc/codecs.conf,v
retrieving revision 1.209
retrieving revision 1.210
diff -u -r1.209 -r1.210
--- codecs.conf	4 Aug 2002 13:52:24 -0000	1.209
+++ codecs.conf	4 Aug 2002 16:06:24 -0000	1.210
@@ -430,6 +430,31 @@
 ; mjpegs:
 ; Notes: m3jpeg+mjpeg are mmx optimized. avid is very stable but slow.
 ; ijpg only decodes jpeg images (no mjpg), and slow. ffmjpeg is buggy.
+; Update: ffmjpeg is almost perfect now, prefer it to others.
+
+; fails only with Spectralfan.mov (marker bug?) & imgp1066.avi (0x0 size)
+videocodec ffmjpeg
+  info "FFmpeg MJPEG decoder"
+  status working
+  fourcc MJPG,mjpg
+  fourcc AVRn,AVDJ  ; AVID
+  fourcc jpeg ; photo-jpeg
+  driver ffmpeg
+  dll mjpeg
+  out 422P
+  out YUY2  ; queryed (conversion from yuv422p)
+  out YV12,I420,IYUV
+
+; slow. usable only for standalone jpegs, like -mf, avid or photojpeg:
+videocodec ijpg
+  info "Independent JPEG Group's codec"
+  status working
+  fourcc ijpg,IJPG   ; -mf type=jpeg
+  fourcc jpeg        ; MOV Photo Jpeg
+  fourcc AVRn,AVDJ  ; AVID
+  driver ijpg
+  dll libjpeg
+  out RGB24,BGR24,BGR32
 
 ; http://www.morgan-multimedia.com/dev/codec_spec.htm
 videocodec m3jpeg
@@ -458,6 +483,7 @@
 videocodec avid
   info "AVID Motion JPEG"
   status working
+  comment "slooooooooow but stable"
   fourcc AVRn
   fourcc AVDJ AVRn
   fourcc MJPG,mjpg AVRn
@@ -470,32 +496,10 @@
   status working
   comment "supports interlaced MJPEG"
   fourcc MJPG
-  fourcc jpeg MJPG
+  fourcc jpeg MJPG  ; MOV Photo Jpeg
   driver vfw
   dll "LCodcCMP.dll"
   out BGR24,BGR15
-
-videocodec ijpg
-  info "Independent JPEG Group's codec"
-  status working
-  fourcc ijpg,IJPG
-  fourcc jpeg       ; MOV Photo Jpeg
-  fourcc AVRn,AVDJ  ; AVID
-  driver ijpg
-  dll libjpeg
-  out RGB24,BGR24,BGR32
-
-videocodec ffmjpeg
-  info "FFmpeg MJPEG decoder"
-  status working
-  fourcc MJPG,mjpg
-;  fourcc AVRn
-  fourcc jpeg ; photo-jpeg
-  driver ffmpeg
-  dll mjpeg
-  out 422P
-  out YUY2  ; queryed (conversion from yuv422p)
-  out YV12,I420,IYUV
 
 ; http://www.morgan-multimedia.com/dev/directshow_dec_spec.htm
 videocodec m3jpegds