From 4d213f46a892707b4dc0111420be2a880b131c6e Mon Sep 17 00:00:00 2001
From: compn <compn@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Tue, 5 Jan 2010 19:12:25 +0000
Subject: add three ADV1 binary codecs to codecs.conf

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

(limited to 'etc')

diff --git a/etc/codecs.conf b/etc/codecs.conf
index c0d88cc42c..a917d4f8af 100644
--- a/etc/codecs.conf
+++ b/etc/codecs.conf
@@ -2399,6 +2399,30 @@ videocodec smsvvfw
   dll "wv32vfw.dll"
   out BGR24 flip
 
+videocodec adv601
+  info "Analog Devices Wavelet Codec"
+  status working
+  fourcc ADV1
+  driver vfw
+  dll "ADV601.dll"
+  out BGR24 flip
+
+videocodec advwavelet
+  info "waveletvideo.freeservers.com"
+  status working
+  fourcc ADV1
+  driver vfw
+  dll "wavelet.dll"
+  out BGR24 flip
+
+videocodec loronixwavlet
+  info "loronix wavelet"
+  status untested
+  fourcc ADV1
+  driver vfw
+  dll "wavlor.dll"
+  out BGR24
+
 videocodec foxmotion
   info "fox motion video"
   status working
-- 
cgit v1.2.3


From 41486125799e648ca07b1c4c237664d19e19db8e Mon Sep 17 00:00:00 2001
From: compn <compn@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Tue, 5 Jan 2010 20:04:44 +0000
Subject: add blox binary codec to codecs.conf

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

(limited to 'etc')

diff --git a/etc/codecs.conf b/etc/codecs.conf
index a917d4f8af..a52064b702 100644
--- a/etc/codecs.conf
+++ b/etc/codecs.conf
@@ -2192,6 +2192,14 @@ videocodec slifvfw
   dll "slif.dll"
   out RGB32 flip
 
+videocodec blox
+  info "Jan Jezabeks BLOX MPEG Codec"
+  status working
+  fourcc BLOX
+  driver vfw
+  dll "blox.dll"
+  out YUY2
+
 videocodec cjpg
   info "Creative Labs Video Blaster Webcam"
   comment "sequential jpeg files?"
-- 
cgit v1.2.3


From 3dfee062b1deea85676710aa1b559b6d1ee81c47 Mon Sep 17 00:00:00 2001
From: compn <compn@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Tue, 5 Jan 2010 20:12:06 +0000
Subject: map zjpeg to ffmjpeg in codecs.conf

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

(limited to 'etc')

diff --git a/etc/codecs.conf b/etc/codecs.conf
index a52064b702..0cb203e2b2 100644
--- a/etc/codecs.conf
+++ b/etc/codecs.conf
@@ -1300,7 +1300,7 @@ videocodec ffmjpeg
   fourcc MVJP       ; Midvid JPEG Video Codec
   fourcc IJLV       ; Intel JPEG Library Video Codec
   fourcc avi1,avi2
-  fourcc MTSJ
+  fourcc MTSJ,ZJPG
   driver ffmpeg
   dll mjpeg
   out 444P
-- 
cgit v1.2.3


From c94c8d30812bdec972f64b94c3e77823830a0490 Mon Sep 17 00:00:00 2001
From: compn <compn@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Wed, 6 Jan 2010 03:44:24 +0000
Subject: add MVLZ and MVDV binary decoders to codecs.conf

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

(limited to 'etc')

diff --git a/etc/codecs.conf b/etc/codecs.conf
index 0cb203e2b2..74043f6aff 100644
--- a/etc/codecs.conf
+++ b/etc/codecs.conf
@@ -1947,6 +1947,22 @@ videocodec psiv
   dll "psiv.dll"
   out BGR32,BGR24 query,flip
 
+videocodec midivid1
+  info "http://www.midivid.com/codec/download.html"
+  status working
+  fourcc MVLZ
+  driver vfw
+  dll "MLZCodec.dll"
+  out BGR24,BGR16 flip
+
+videocodec midivid2
+  info "http://www.midivid.com/codec/download.html"
+  status working
+  fourcc MVDV
+  driver vfw
+  dll "MVCodec.dll"
+  out BGR24 flip
+
 videocodec midivid3
   info "www.midivid.com/codec/mv3codec.html"
   status working
-- 
cgit v1.2.3