fixed JPEG issue (sorry atmos, i've tested them now) and added PIM1 name corrections

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8337 b3059339-0415-0410-9bf9-f77b7e298cf2

1 files changed, 9 insertions, 9 deletions

diff --git a/etc/codecs.conf b/etc/codecs.conf
index 7e4d828a8e..3b39f7eb84 100644
--- a/etc/codecs.conf
+++ b/etc/codecs.conf
@@ -37,7 +37,7 @@ videocodec ffmpeg12
   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 @@ videocodec ffmjpeg
   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 @@ videocodec ijpg
   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 @@ videocodec LEAD
   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 @@ videocodec vcr1
   out RGB24 flip
 
 videocodec pim1
-  info "PIM1"
+  info "Pinnacle Hardware MPEG1"
   status crashing
   comment "no picture. use ffmpeg12!"
   fourcc PIM1