From a4b7f5a01b8379cdf7f6538406866d49546902b6 Mon Sep 17 00:00:00 2001
From: compn <compn@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Mon, 22 Dec 2008 16:51:06 +0000
Subject: re-add codecs: sif1 (directshow version) and acdsee mjpeg

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28179 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 etc/codecs.conf | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

(limited to 'etc')

diff --git a/etc/codecs.conf b/etc/codecs.conf
index bd375117dc..a8a6e211fb 100644
--- a/etc/codecs.conf
+++ b/etc/codecs.conf
@@ -1173,6 +1173,14 @@ videocodec LEAD
   dll "LCodcCMP.dll"
   out BGR24,BGR15
 
+videocodec acdsee
+  info "ACDSee mjpeg"
+  status working
+  fourcc ACDV
+  driver vfw
+  dll "ACDV.dll"
+  out BGR32,BGR24,BGR15 flip
+
 videocodec imagepower
   info "ImagePower MJPEG2000"
   status buggy
@@ -1944,6 +1952,16 @@ videocodec sif1vfw
   dll "Sif1_vfw.dll"
   out YV12,YUY2
 
+videocodec sif1ds
+  info "sif1 alpha4"
+  status buggy
+  comment "one frame every 5 seconds?"
+  fourcc SIF1
+  driver dshow
+  dll "Sif1Dec.ax"
+  guid 0x31666973, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71
+  out BGR32
+
 videocodec ffamv
   info "Modified MJPEG, used in AMV files"
   status working
@@ -3875,4 +3893,4 @@ audiocodec uleaddva
   format 0x215
   format 0x216
   driver acm
-  dll "dvacm.acm"
\ No newline at end of file
+  dll "dvacm.acm"
-- 
cgit v1.2.3