From cecd8bda2a367185d65284245deb8789b1dee79a Mon Sep 17 00:00:00 2001
From: atmos4 <atmos4@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Thu, 28 Nov 2002 21:37:07 +0000
Subject: Update with JPEG FourCC, as found in SGI created baard.avi
 photo-jpeg. See ffmpeg-devel list, change to LEAD codec is untested as I
 don't have it...

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8310 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 etc/codecs.conf | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/etc/codecs.conf b/etc/codecs.conf
index 5d21b6a19d..e2638cf1f6 100644
--- a/etc/codecs.conf
+++ b/etc/codecs.conf
@@ -501,7 +501,7 @@ videocodec ffmjpeg
   status working
   fourcc MJPG,mjpg
   fourcc AVRn,AVDJ  ; AVID
-  fourcc jpeg ; photo-jpeg
+  fourcc jpeg,JPEG ; photo-jpeg
   fourcc mjpa ; Apple MJPEG-A (Quicktime)
   fourcc JFIF ; SMJPEG (Loki)
   fourcc ijpg,IJPG ; -mf type=jpeg
@@ -517,7 +517,7 @@ videocodec ijpg
   info "Independent JPEG Group's codec"
   status working
   fourcc ijpg,IJPG   ; -mf type=jpeg
-  fourcc jpeg        ; MOV Photo Jpeg
+  fourcc jpeg,JPEG  ; MOV Photo Jpeg
   fourcc AVRn,AVDJ  ; AVID
   driver ijpg
   dll libjpeg
@@ -564,6 +564,7 @@ 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
-- 
cgit v1.2.3