[Mplayer-cvslog] CVS: main/etc codecs.conf,1.255,1.256

[Alex Beregszaszi]

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

Modified Files:
	codecs.conf 
Log Message:
fixed JPEG issue (sorry atmos, i've tested them now) and added PIM1 name corrections

Index: codecs.conf
===================================================================
RCS file: /cvsroot/mplayer/main/etc/codecs.conf,v
retrieving revision 1.255
retrieving revision 1.256
diff -u -r1.255 -r1.256
--- codecs.conf	3 Dec 2002 02:02:58 -0000	1.255
+++ codecs.conf	3 Dec 2002 15:27:07 -0000	1.256
@@ -37,7 +37,7 @@
   format 0x10000001  ; mpeg 1
   format 0x10000002  ; mpeg 2
   fourcc mpg1,mpg2
-  fourcc PIM1
+  fourcc PIM1        ; Pinnacle hardware-mpeg1
   driver ffmpeg
   dll "mpegvideo"
   out YV12,I420,IYUV
@@ -501,10 +501,11 @@
   status working
   fourcc MJPG,mjpg
   fourcc AVRn,AVDJ  ; AVID
-  fourcc jpeg,JPEG ; photo-jpeg
-  fourcc mjpa ; Apple MJPEG-A (Quicktime)
-  fourcc JFIF ; SMJPEG (Loki)
-  fourcc ijpg,IJPG ; -mf type=jpeg
+  fourcc jpeg       ; MOV photo-jpeg
+  fourcc mjpa       ; Apple MJPEG-A (Quicktime)
+  fourcc JFIF       ; SMJPEG (Loki)
+  fourcc ijpg,IJPG  ; -mf type=jpeg
+  fourcc JPEG       ; SGI's AVI Photo-jpeg
   driver ffmpeg
   dll mjpeg
   out 444P
@@ -517,8 +518,8 @@
   info "Independent JPEG Group's codec"
   status working
   fourcc ijpg,IJPG   ; -mf type=jpeg
-  fourcc jpeg,JPEG  ; MOV Photo Jpeg
-  fourcc AVRn,AVDJ  ; AVID
+  fourcc jpeg        ; MOV Photo Jpeg
+  fourcc AVRn,AVDJ   ; AVID
   driver ijpg
   dll libjpeg
   out RGB24,BGR24,BGR32
@@ -564,7 +565,6 @@
   comment "supports interlaced MJPEG"
   fourcc MJPG
   fourcc jpeg MJPG  ; MOV Photo Jpeg
-  fourcc JPEG MJPG  ; AVI Photo Jpeg
   driver vfw
   dll "LCodcCMP.dll"
   out BGR24,BGR15
@@ -1109,7 +1109,7 @@
   out RGB24 flip
 
 videocodec pim1
-  info "PIM1"
+  info "Pinnacle Hardware MPEG1"
   status crashing
   comment "no picture. use ffmpeg12!"
   fourcc PIM1