diff --git a/configure b/configure
index 3588635537c3575a1e0360dd6bdb4988750ed64f..a79cd63a48170ec09426af951114d0ad56a125f5 100755
--- a/configure
+++ b/configure
@@ -19106,7 +19106,7 @@ MAKE_LIB_RULES=libs/Makelib.rules
 MAKE_PROG_RULES=programs/Makeprog.rules
 
 
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          ac_config_files="$ac_config_files Make.rules dlls/Makedll.rules dlls/Maketest.rules libs/Makelib.rules programs/Makeprog.rules Makefile dlls/Makefile dlls/advapi32/Makefile dlls/advapi32/tests/Makefile dlls/avicap32/Makefile dlls/avifil32/Makefile dlls/cabinet/Makefile dlls/capi2032/Makefile dlls/cfgmgr32/Makefile dlls/comcat/Makefile dlls/comctl32/Makefile dlls/comctl32/tests/Makefile dlls/commdlg/Makefile dlls/crtdll/Makefile dlls/crypt32/Makefile dlls/ctl3d/Makefile dlls/wined3d/Makefile dlls/d3d8/Makefile dlls/d3d9/Makefile dlls/d3dim/Makefile dlls/d3dx8/Makefile dlls/dciman32/Makefile dlls/ddraw/Makefile dlls/ddraw/tests/Makefile dlls/devenum/Makefile dlls/dinput/Makefile dlls/dinput8/Makefile dlls/dmband/Makefile dlls/dmcompos/Makefile dlls/dmime/Makefile dlls/dmloader/Makefile dlls/dmscript/Makefile dlls/dmstyle/Makefile dlls/dmsynth/Makefile dlls/dmusic/Makefile dlls/dmusic32/Makefile dlls/dplay/Makefile dlls/dplayx/Makefile dlls/dpnhpast/Makefile dlls/dsound/Makefile dlls/dsound/tests/Makefile dlls/gdi/Makefile dlls/gdi/tests/Makefile dlls/glu32/Makefile dlls/glut32/Makefile dlls/icmp/Makefile dlls/imagehlp/Makefile dlls/imm32/Makefile dlls/iphlpapi/Makefile dlls/iphlpapi/tests/Makefile dlls/kernel/Makefile dlls/kernel/tests/Makefile dlls/lzexpand/Makefile dlls/mapi32/Makefile dlls/mpr/Makefile dlls/msacm/Makefile dlls/msacm/imaadp32/Makefile dlls/msacm/msadp32/Makefile dlls/msacm/msg711/Makefile dlls/msacm/winemp3/Makefile dlls/msdmo/Makefile dlls/mshtml/Makefile dlls/msi/Makefile dlls/msimg32/Makefile dlls/msisys/Makefile dlls/msnet32/Makefile dlls/msvcrt/Makefile dlls/msvcrt/tests/Makefile dlls/msvcrt20/Makefile dlls/msvcrt40/Makefile dlls/msvcrtd/Makefile dlls/msvideo/Makefile dlls/msvideo/msrle32/Makefile dlls/mswsock/Makefile dlls/netapi32/Makefile dlls/netapi32/tests/Makefile dlls/newdev/Makefile dlls/ntdll/Makefile dlls/ntdll/tests/Makefile dlls/odbc32/Makefile dlls/ole32/Makefile dlls/oleacc/Makefile dlls/oleaut32/Makefile dlls/oleaut32/tests/Makefile dlls/olecli/Makefile dlls/oledlg/Makefile dlls/olepro32/Makefile dlls/olesvr/Makefile dlls/opengl32/Makefile dlls/psapi/Makefile dlls/qcap/Makefile dlls/quartz/Makefile dlls/rasapi32/Makefile dlls/richedit/Makefile dlls/rpcrt4/Makefile dlls/rpcrt4/tests/Makefile dlls/serialui/Makefile dlls/setupapi/Makefile dlls/shdocvw/Makefile dlls/shell32/Makefile dlls/shell32/tests/Makefile dlls/shfolder/Makefile dlls/shlwapi/Makefile dlls/shlwapi/tests/Makefile dlls/snmpapi/Makefile dlls/sti/Makefile dlls/tapi32/Makefile dlls/ttydrv/Makefile dlls/twain/Makefile dlls/unicows/Makefile dlls/url/Makefile dlls/urlmon/Makefile dlls/urlmon/tests/Makefile dlls/user/Makefile dlls/user/tests/Makefile dlls/uxtheme/Makefile dlls/version/Makefile dlls/win32s/Makefile dlls/winaspi/Makefile dlls/winedos/Makefile dlls/wineps/Makefile dlls/wininet/Makefile dlls/wininet/tests/Makefile dlls/winmm/Makefile dlls/winmm/joystick/Makefile dlls/winmm/mcianim/Makefile dlls/winmm/mciavi/Makefile dlls/winmm/mcicda/Makefile dlls/winmm/mciseq/Makefile dlls/winmm/mciwave/Makefile dlls/winmm/midimap/Makefile dlls/winmm/tests/Makefile dlls/winmm/wavemap/Makefile dlls/winmm/winealsa/Makefile dlls/winmm/winearts/Makefile dlls/winmm/wineaudioio/Makefile dlls/winmm/winenas/Makefile dlls/winmm/winejack/Makefile dlls/winmm/wineoss/Makefile dlls/winnls/Makefile dlls/winsock/Makefile dlls/winsock/tests/Makefile dlls/winspool/Makefile dlls/winspool/tests/Makefile dlls/wintab32/Makefile dlls/wintrust/Makefile dlls/wow32/Makefile dlls/wsock32/Makefile dlls/x11drv/Makefile documentation/Makefile include/Makefile libs/Makefile libs/port/Makefile libs/unicode/Makefile libs/uuid/Makefile libs/wine/Makefile libs/wpp/Makefile loader/Makefile programs/Makefile programs/avitools/Makefile programs/clock/Makefile programs/cmdlgtst/Makefile programs/control/Makefile programs/expand/Makefile programs/notepad/Makefile programs/progman/Makefile programs/regedit/Makefile programs/regsvr32/Makefile programs/rpcss/Makefile programs/rundll32/Makefile programs/start/Makefile programs/uninstaller/Makefile programs/view/Makefile programs/wcmd/Makefile programs/wineboot/Makefile programs/winebrowser/Makefile programs/winecfg/Makefile programs/wineconsole/Makefile programs/winedbg/Makefile programs/winefile/Makefile programs/winemenubuilder/Makefile programs/winemine/Makefile programs/winepath/Makefile programs/winetest/Makefile programs/winevdm/Makefile programs/winhelp/Makefile programs/winver/Makefile server/Makefile tools/Makefile tools/widl/Makefile tools/winapi/Makefile tools/winebuild/Makefile tools/winedump/Makefile tools/winegcc/Makefile tools/wmc/Makefile tools/wrc/Makefile"
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    ac_config_files="$ac_config_files Make.rules dlls/Makedll.rules dlls/Maketest.rules libs/Makelib.rules programs/Makeprog.rules Makefile dlls/Makefile dlls/advapi32/Makefile dlls/advapi32/tests/Makefile dlls/avicap32/Makefile dlls/avifil32/Makefile dlls/cabinet/Makefile dlls/capi2032/Makefile dlls/cfgmgr32/Makefile dlls/comcat/Makefile dlls/comctl32/Makefile dlls/comctl32/tests/Makefile dlls/commdlg/Makefile dlls/crtdll/Makefile dlls/crypt32/Makefile dlls/ctl3d/Makefile dlls/wined3d/Makefile dlls/d3d8/Makefile dlls/d3d9/Makefile dlls/d3dim/Makefile dlls/d3dx8/Makefile dlls/dciman32/Makefile dlls/ddraw/Makefile dlls/ddraw/tests/Makefile dlls/devenum/Makefile dlls/dinput/Makefile dlls/dinput8/Makefile dlls/dmband/Makefile dlls/dmcompos/Makefile dlls/dmime/Makefile dlls/dmloader/Makefile dlls/dmscript/Makefile dlls/dmstyle/Makefile dlls/dmsynth/Makefile dlls/dmusic/Makefile dlls/dmusic32/Makefile dlls/dplay/Makefile dlls/dplayx/Makefile dlls/dpnhpast/Makefile dlls/dsound/Makefile dlls/dsound/tests/Makefile dlls/gdi/Makefile dlls/gdi/tests/Makefile dlls/glu32/Makefile dlls/glut32/Makefile dlls/iccvid/Makefile dlls/icmp/Makefile dlls/imagehlp/Makefile dlls/imm32/Makefile dlls/iphlpapi/Makefile dlls/iphlpapi/tests/Makefile dlls/kernel/Makefile dlls/kernel/tests/Makefile dlls/lzexpand/Makefile dlls/mapi32/Makefile dlls/mpr/Makefile dlls/msacm/Makefile dlls/msacm/imaadp32/Makefile dlls/msacm/msadp32/Makefile dlls/msacm/msg711/Makefile dlls/msacm/winemp3/Makefile dlls/msdmo/Makefile dlls/mshtml/Makefile dlls/msi/Makefile dlls/msimg32/Makefile dlls/msisys/Makefile dlls/msnet32/Makefile dlls/msvcrt/Makefile dlls/msvcrt/tests/Makefile dlls/msvcrt20/Makefile dlls/msvcrt40/Makefile dlls/msvcrtd/Makefile dlls/msvideo/Makefile dlls/msvideo/msrle32/Makefile dlls/mswsock/Makefile dlls/netapi32/Makefile dlls/netapi32/tests/Makefile dlls/newdev/Makefile dlls/ntdll/Makefile dlls/ntdll/tests/Makefile dlls/odbc32/Makefile dlls/ole32/Makefile dlls/oleacc/Makefile dlls/oleaut32/Makefile dlls/oleaut32/tests/Makefile dlls/olecli/Makefile dlls/oledlg/Makefile dlls/olepro32/Makefile dlls/olesvr/Makefile dlls/opengl32/Makefile dlls/psapi/Makefile dlls/qcap/Makefile dlls/quartz/Makefile dlls/rasapi32/Makefile dlls/richedit/Makefile dlls/rpcrt4/Makefile dlls/rpcrt4/tests/Makefile dlls/serialui/Makefile dlls/setupapi/Makefile dlls/shdocvw/Makefile dlls/shell32/Makefile dlls/shell32/tests/Makefile dlls/shfolder/Makefile dlls/shlwapi/Makefile dlls/shlwapi/tests/Makefile dlls/snmpapi/Makefile dlls/sti/Makefile dlls/tapi32/Makefile dlls/ttydrv/Makefile dlls/twain/Makefile dlls/unicows/Makefile dlls/url/Makefile dlls/urlmon/Makefile dlls/urlmon/tests/Makefile dlls/user/Makefile dlls/user/tests/Makefile dlls/uxtheme/Makefile dlls/version/Makefile dlls/win32s/Makefile dlls/winaspi/Makefile dlls/winedos/Makefile dlls/wineps/Makefile dlls/wininet/Makefile dlls/wininet/tests/Makefile dlls/winmm/Makefile dlls/winmm/joystick/Makefile dlls/winmm/mcianim/Makefile dlls/winmm/mciavi/Makefile dlls/winmm/mcicda/Makefile dlls/winmm/mciseq/Makefile dlls/winmm/mciwave/Makefile dlls/winmm/midimap/Makefile dlls/winmm/tests/Makefile dlls/winmm/wavemap/Makefile dlls/winmm/winealsa/Makefile dlls/winmm/winearts/Makefile dlls/winmm/wineaudioio/Makefile dlls/winmm/winenas/Makefile dlls/winmm/winejack/Makefile dlls/winmm/wineoss/Makefile dlls/winnls/Makefile dlls/winsock/Makefile dlls/winsock/tests/Makefile dlls/winspool/Makefile dlls/winspool/tests/Makefile dlls/wintab32/Makefile dlls/wintrust/Makefile dlls/wow32/Makefile dlls/wsock32/Makefile dlls/x11drv/Makefile documentation/Makefile include/Makefile libs/Makefile libs/port/Makefile libs/unicode/Makefile libs/uuid/Makefile libs/wine/Makefile libs/wpp/Makefile loader/Makefile programs/Makefile programs/avitools/Makefile programs/clock/Makefile programs/cmdlgtst/Makefile programs/control/Makefile programs/expand/Makefile programs/notepad/Makefile programs/progman/Makefile programs/regedit/Makefile programs/regsvr32/Makefile programs/rpcss/Makefile programs/rundll32/Makefile programs/start/Makefile programs/uninstaller/Makefile programs/view/Makefile programs/wcmd/Makefile programs/wineboot/Makefile programs/winebrowser/Makefile programs/winecfg/Makefile programs/wineconsole/Makefile programs/winedbg/Makefile programs/winefile/Makefile programs/winemenubuilder/Makefile programs/winemine/Makefile programs/winepath/Makefile programs/winetest/Makefile programs/winevdm/Makefile programs/winhelp/Makefile programs/winver/Makefile server/Makefile tools/Makefile tools/widl/Makefile tools/winapi/Makefile tools/winebuild/Makefile tools/winedump/Makefile tools/winegcc/Makefile tools/wmc/Makefile tools/wrc/Makefile"
 
 
 cat >confcache <<\_ACEOF
@@ -19687,6 +19687,7 @@ do
   "dlls/gdi/tests/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/gdi/tests/Makefile" ;;
   "dlls/glu32/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/glu32/Makefile" ;;
   "dlls/glut32/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/glut32/Makefile" ;;
+  "dlls/iccvid/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/iccvid/Makefile" ;;
   "dlls/icmp/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/icmp/Makefile" ;;
   "dlls/imagehlp/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/imagehlp/Makefile" ;;
   "dlls/imm32/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/imm32/Makefile" ;;
diff --git a/configure.ac b/configure.ac
index 9807b834f323118dd4386d7006ecaa771d5794ca..6275b634cd71c56eb8b38f02c7ce511aa8914245 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1523,6 +1523,7 @@ dlls/gdi/Makefile
 dlls/gdi/tests/Makefile
 dlls/glu32/Makefile
 dlls/glut32/Makefile
+dlls/iccvid/Makefile
 dlls/icmp/Makefile
 dlls/imagehlp/Makefile
 dlls/imm32/Makefile
diff --git a/dlls/Makefile.in b/dlls/Makefile.in
index a7306e0c57735260ca3e9cd58c459b3449907ce2..5c58a49838dac4417fec567fb0a0ada54af5bbd4 100644
--- a/dlls/Makefile.in
+++ b/dlls/Makefile.in
@@ -47,6 +47,7 @@ BASEDIRS = \
 	dpnhpast \
 	dsound \
 	gdi \
+	iccvid \
 	icmp \
 	imagehlp \
 	imm32 \
@@ -239,6 +240,7 @@ SYMLINKS = \
 	dpnhpast.dll$(DLLEXT) \
 	dsound.dll$(DLLEXT) \
 	gdi32.dll$(DLLEXT) \
+	iccvid.dll$(DLLEXT) \
 	icmp.dll$(DLLEXT) \
 	imaadp32.acm$(DLLEXT) \
 	imagehlp.dll$(DLLEXT) \
@@ -456,6 +458,9 @@ glu32.dll$(DLLEXT): glu32/glu32.dll$(DLLEXT)
 glut32.dll$(DLLEXT): glut32/glut32.dll$(DLLEXT)
 	$(RM) $@ && $(LN_S) glut32/glut32.dll$(DLLEXT) $@
 
+iccvid.dll$(DLLEXT): iccvid/iccvid.dll$(DLLEXT)
+	$(RM) $@ && $(LN_S) iccvid/iccvid.dll$(DLLEXT) $@
+
 icmp.dll$(DLLEXT): icmp/icmp.dll$(DLLEXT)
 	$(RM) $@ && $(LN_S) icmp/icmp.dll$(DLLEXT) $@
 
@@ -838,6 +843,7 @@ IMPORT_LIBS = \
 	libgdi32 \
 	libglu32 \
 	libglut32 \
+	libiccvid \
 	libicmp \
 	libimagehlp \
 	libimm32 \
@@ -1095,6 +1101,11 @@ libglut32.def: glut32/glut32.spec.def
 libglut32.a: glut32/glut32.spec.def
 	$(DLLTOOL) -k -l $@ -d glut32/glut32.spec.def
 
+libiccvid.def: iccvid/iccvid.spec.def
+	$(RM) $@ && $(LN_S) iccvid/iccvid.spec.def $@
+libiccvid.a: iccvid/iccvid.spec.def
+	$(DLLTOOL) -k -l $@ -d iccvid/iccvid.spec.def
+
 libicmp.def: icmp/icmp.spec.def
 	$(RM) $@ && $(LN_S) icmp/icmp.spec.def $@
 libicmp.a: icmp/icmp.spec.def
@@ -1487,6 +1498,7 @@ dsound/dsound.spec.def: $(WINEBUILD)
 gdi/gdi32.spec.def: $(WINEBUILD)
 glu32/glu32.spec.def: $(WINEBUILD)
 glut32/glut32.spec.def: $(WINEBUILD)
+iccvid/iccvid.spec.def: $(WINEBUILD)
 icmp/icmp.spec.def: $(WINEBUILD)
 imagehlp/imagehlp.spec.def: $(WINEBUILD)
 imm32/imm32.spec.def: $(WINEBUILD)
@@ -1602,6 +1614,7 @@ dsound/dsound.dll$(DLLEXT): dsound
 gdi/gdi32.dll$(DLLEXT): gdi
 glu32/glu32.dll$(DLLEXT): glu32
 glut32/glut32.dll$(DLLEXT): glut32
+iccvid/iccvid.dll$(DLLEXT): iccvid
 icmp/icmp.dll$(DLLEXT): icmp
 msacm/imaadp32/imaadp32.acm$(DLLEXT): msacm/imaadp32
 imagehlp/imagehlp.dll$(DLLEXT): imagehlp
diff --git a/dlls/iccvid/.cvsignore b/dlls/iccvid/.cvsignore
new file mode 100644
index 0000000000000000000000000000000000000000..cab657e53b9005bc3b75184cd4693b6c761ca7e4
--- /dev/null
+++ b/dlls/iccvid/.cvsignore
@@ -0,0 +1,4 @@
+Makefile
+iccvid.dll.dbg.c
+iccvid.spec.c
+iccvid.spec.def
diff --git a/dlls/iccvid/Makefile.in b/dlls/iccvid/Makefile.in
new file mode 100644
index 0000000000000000000000000000000000000000..f4df96a3bcb25d33b208a0cf40ff36a5d0b12db2
--- /dev/null
+++ b/dlls/iccvid/Makefile.in
@@ -0,0 +1,13 @@
+TOPSRCDIR = @top_srcdir@
+TOPOBJDIR = ../..
+SRCDIR    = @srcdir@
+VPATH     = @srcdir@
+MODULE    = iccvid.dll
+IMPORTS   = kernel32
+
+C_SRCS = \
+	iccvid.c
+
+@MAKE_DLL_RULES@
+
+### Dependencies:
diff --git a/dlls/iccvid/iccvid.c b/dlls/iccvid/iccvid.c
new file mode 100644
index 0000000000000000000000000000000000000000..1c4b972a18ea60a2e8561e5ddfe2220025b07f31
--- /dev/null
+++ b/dlls/iccvid/iccvid.c
@@ -0,0 +1,881 @@
+/*
+ * Radius Cinepak Video Decoder
+ *
+ * Copyright 2001 Dr. Tim Ferguson (see below)
+ * Portions Copyright 2003 Mike McCormack for CodeWeavers
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+/* Copyright notice from original source:
+ * ------------------------------------------------------------------------
+ * Radius Cinepak Video Decoder
+ *
+ * Dr. Tim Ferguson, 2001.
+ * For more details on the algorithm:
+ *         http://www.csse.monash.edu.au/~timf/videocodec.html
+ *
+ * This is basically a vector quantiser with adaptive vector density.  The
+ * frame is segmented into 4x4 pixel blocks, and each block is coded using
+ * either 1 or 4 vectors.
+ *
+ * There are still some issues with this code yet to be resolved.  In
+ * particular with decoding in the strip boundaries.  However, I have not
+ * yet found a sequence it doesn't work on.  Ill keep trying :)
+ *
+ * You may freely use this source code.  I only ask that you reference its
+ * source in your projects documentation:
+ *       Tim Ferguson: http://www.csse.monash.edu.au/~timf/
+ * ------------------------------------------------------------------------ */
+
+#include <stdarg.h>
+#include "windef.h"
+#include "winbase.h"
+#include "wingdi.h"
+#include "winuser.h"
+#include "commdlg.h"
+#include "vfw.h"
+
+#include "mmsystem.h"
+
+#include "wine/debug.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(iccvid);
+
+#define ICCVID_MAGIC mmioFOURCC('c', 'v', 'i', 'd')
+
+#define DBUG    0
+#define MAX_STRIPS 32
+
+/* ------------------------------------------------------------------------ */
+typedef struct
+{
+    unsigned char y0, y1, y2, y3;
+    char u, v;
+    unsigned long rgb0, rgb1, rgb2, rgb3;        /* should be a union */
+    unsigned char r[4], g[4], b[4];
+} cvid_codebook;
+
+typedef struct {
+    cvid_codebook *v4_codebook[MAX_STRIPS];
+    cvid_codebook *v1_codebook[MAX_STRIPS];
+    int strip_num;
+} cinepak_info;
+
+typedef struct _ICCVID_Info
+{
+    DWORD         dwMagic;
+    cinepak_info *cvinfo;
+} ICCVID_Info;
+
+static inline LPVOID ICCVID_Alloc( size_t size, size_t count )
+{
+    return HeapAlloc( GetProcessHeap(), 0, size*count );
+}
+
+static inline BOOL ICCVID_Free( LPVOID ptr )
+{
+    return HeapFree( GetProcessHeap(), 0, ptr );
+}
+
+
+/* ------------------------------------------------------------------------ */
+static unsigned char *in_buffer, uiclip[1024], *uiclp = NULL;
+
+#define get_byte() *(in_buffer++)
+#define skip_byte() in_buffer++
+#define get_word() ((unsigned short)(in_buffer += 2, \
+    (in_buffer[-2] << 8 | in_buffer[-1])))
+#define get_long() ((unsigned long)(in_buffer += 4, \
+    (in_buffer[-4] << 24 | in_buffer[-3] << 16 | in_buffer[-2] << 8 | in_buffer[-1])))
+
+
+/* ---------------------------------------------------------------------- */
+static inline void read_codebook_32(cvid_codebook *c, int mode)
+{
+int uvr, uvg, uvb;
+
+    if(mode)        /* black and white */
+        {
+        c->y0 = get_byte();
+        c->y1 = get_byte();
+        c->y2 = get_byte();
+        c->y3 = get_byte();
+        c->u = c->v = 0;
+
+        c->rgb0 = (c->y0 << 16) | (c->y0 << 8) | c->y0;
+        c->rgb1 = (c->y1 << 16) | (c->y1 << 8) | c->y1;
+        c->rgb2 = (c->y2 << 16) | (c->y2 << 8) | c->y2;
+        c->rgb3 = (c->y3 << 16) | (c->y3 << 8) | c->y3;
+        }
+    else            /* colour */
+        {
+        c->y0 = get_byte();  /* luma */
+        c->y1 = get_byte();
+        c->y2 = get_byte();
+        c->y3 = get_byte();
+        c->u = get_byte(); /* chroma */
+        c->v = get_byte();
+
+        uvr = c->v << 1;
+        uvg = -((c->u+1) >> 1) - c->v;
+        uvb = c->u << 1;
+
+        c->rgb0 = (uiclp[c->y0 + uvr] << 16) | (uiclp[c->y0 + uvg] << 8) | uiclp[c->y0 + uvb];
+        c->rgb1 = (uiclp[c->y1 + uvr] << 16) | (uiclp[c->y1 + uvg] << 8) | uiclp[c->y1 + uvb];
+        c->rgb2 = (uiclp[c->y2 + uvr] << 16) | (uiclp[c->y2 + uvg] << 8) | uiclp[c->y2 + uvb];
+        c->rgb3 = (uiclp[c->y3 + uvr] << 16) | (uiclp[c->y3 + uvg] << 8) | uiclp[c->y3 + uvb];
+        }
+}
+
+
+/* ------------------------------------------------------------------------ */
+inline void cvid_v1_32(unsigned char *frm, unsigned char *limit, int stride, cvid_codebook *cb)
+{
+unsigned long *vptr = (unsigned long *)frm, rgb;
+int row_inc = stride/4;
+
+#ifndef ORIGINAL
+    vptr += row_inc*3;
+#endif
+    vptr[0] = rgb = cb->rgb0; vptr[1] = rgb;
+    vptr[2] = rgb = cb->rgb1; vptr[3] = rgb;
+#ifndef ORIGINAL
+    vptr -= row_inc; if(vptr < (unsigned long *)limit) return;
+#else
+    vptr += row_inc; if(vptr > (unsigned long *)limit) return;
+#endif
+    vptr[0] = rgb = cb->rgb0; vptr[1] = rgb;
+    vptr[2] = rgb = cb->rgb1; vptr[3] = rgb;
+#ifndef ORIGINAL
+    vptr -= row_inc; if(vptr < (unsigned long *)limit) return;
+#else
+    vptr += row_inc; if(vptr > (unsigned long *)limit) return;
+#endif
+    vptr[0] = rgb = cb->rgb2; vptr[1] = rgb;
+    vptr[2] = rgb = cb->rgb3; vptr[3] = rgb;
+#ifndef ORIGINAL
+    vptr -= row_inc; if(vptr < (unsigned long *)limit) return;
+#else
+    vptr += row_inc; if(vptr > (unsigned long *)limit) return;
+#endif
+    vptr[0] = rgb = cb->rgb2; vptr[1] = rgb;
+    vptr[2] = rgb = cb->rgb3; vptr[3] = rgb;
+}
+
+
+/* ------------------------------------------------------------------------ */
+inline void cvid_v4_32(unsigned char *frm, unsigned char *limit, int stride, cvid_codebook *cb0,
+    cvid_codebook *cb1, cvid_codebook *cb2, cvid_codebook *cb3)
+{
+unsigned long *vptr = (unsigned long *)frm;
+int row_inc = stride/4;
+
+#ifndef ORIGINAL
+    vptr += row_inc*3;
+#endif
+    vptr[0] = cb0->rgb0;
+    vptr[1] = cb0->rgb1;
+    vptr[2] = cb1->rgb0;
+    vptr[3] = cb1->rgb1;
+#ifndef ORIGINAL
+    vptr -= row_inc; if(vptr < (unsigned long *)limit) return;
+#else
+    vptr += row_inc; if(vptr > (unsigned long *)limit) return;
+#endif
+    vptr[0] = cb0->rgb2;
+    vptr[1] = cb0->rgb3;
+    vptr[2] = cb1->rgb2;
+    vptr[3] = cb1->rgb3;
+#ifndef ORIGINAL
+    vptr -= row_inc; if(vptr < (unsigned long *)limit) return;
+#else
+    vptr += row_inc; if(vptr > (unsigned long *)limit) return;
+#endif
+    vptr[0] = cb2->rgb0;
+    vptr[1] = cb2->rgb1;
+    vptr[2] = cb3->rgb0;
+    vptr[3] = cb3->rgb1;
+#ifndef ORIGINAL
+    vptr -= row_inc; if(vptr < (unsigned long *)limit) return;
+#else
+    vptr += row_inc; if(vptr > (unsigned long *)limit) return;
+#endif
+    vptr[0] = cb2->rgb2;
+    vptr[1] = cb2->rgb3;
+    vptr[2] = cb3->rgb2;
+    vptr[3] = cb3->rgb3;
+}
+
+
+/* ---------------------------------------------------------------------- */
+static inline void read_codebook_24(cvid_codebook *c, int mode)
+{
+int uvr, uvg, uvb;
+
+    if(mode)        /* black and white */
+        {
+        c->y0 = get_byte();
+        c->y1 = get_byte();
+        c->y2 = get_byte();
+        c->y3 = get_byte();
+        c->u = c->v = 0;
+
+        c->r[0] = c->g[0] = c->b[0] = c->y0;
+        c->r[1] = c->g[1] = c->b[1] = c->y1;
+        c->r[2] = c->g[2] = c->b[2] = c->y2;
+        c->r[3] = c->g[3] = c->b[3] = c->y3;
+        }
+    else            /* colour */
+        {
+        c->y0 = get_byte();  /* luma */
+        c->y1 = get_byte();
+        c->y2 = get_byte();
+        c->y3 = get_byte();
+        c->u = get_byte(); /* chroma */
+        c->v = get_byte();
+
+        uvr = c->v << 1;
+        uvg = -((c->u+1) >> 1) - c->v;
+        uvb = c->u << 1;
+
+        c->r[0] = uiclp[c->y0 + uvr]; c->g[0] = uiclp[c->y0 + uvg]; c->b[0] = uiclp[c->y0 + uvb];
+        c->r[1] = uiclp[c->y1 + uvr]; c->g[1] = uiclp[c->y1 + uvg]; c->b[1] = uiclp[c->y1 + uvb];
+        c->r[2] = uiclp[c->y2 + uvr]; c->g[2] = uiclp[c->y2 + uvg]; c->b[2] = uiclp[c->y2 + uvb];
+        c->r[3] = uiclp[c->y3 + uvr]; c->g[3] = uiclp[c->y3 + uvg]; c->b[3] = uiclp[c->y3 + uvb];
+        }
+}
+
+
+/* ------------------------------------------------------------------------ */
+void cvid_v1_24(unsigned char *vptr, unsigned char *limit, int stride, cvid_codebook *cb)
+{
+unsigned char r, g, b;
+#ifndef ORIGINAL
+int row_inc = stride+4*3;
+#else
+int row_inc = stride-4*3;
+#endif
+
+#ifndef ORIGINAL
+    vptr += (3*row_inc);
+#endif
+    *vptr++ = b = cb->b[0]; *vptr++ = g = cb->g[0]; *vptr++ = r = cb->r[0];
+    *vptr++ = b; *vptr++ = g; *vptr++ = r;
+    *vptr++ = b = cb->b[1]; *vptr++ = g = cb->g[1]; *vptr++ = r = cb->r[1];
+    *vptr++ = b; *vptr++ = g; *vptr++ = r;
+#ifndef ORIGINAL
+    vptr -= row_inc; if(vptr < limit) return;
+#else
+    vptr += row_inc; if(vptr > limit) return;
+#endif
+    *vptr++ = b = cb->b[0]; *vptr++ = g = cb->g[0]; *vptr++ = r = cb->r[0];
+    *vptr++ = b; *vptr++ = g; *vptr++ = r;
+    *vptr++ = b = cb->b[1]; *vptr++ = g = cb->g[1]; *vptr++ = r = cb->r[1];
+    *vptr++ = b; *vptr++ = g; *vptr++ = r;
+#ifndef ORIGINAL
+    vptr -= row_inc; if(vptr < limit) return;
+#else
+    vptr += row_inc; if(vptr > limit) return;
+#endif
+    *vptr++ = b = cb->b[2]; *vptr++ = g = cb->g[2]; *vptr++ = r = cb->r[2];
+    *vptr++ = b; *vptr++ = g; *vptr++ = r;
+    *vptr++ = b = cb->b[3]; *vptr++ = g = cb->g[3]; *vptr++ = r = cb->r[3];
+    *vptr++ = b; *vptr++ = g; *vptr++ = r;
+#ifndef ORIGINAL
+    vptr -= row_inc; if(vptr < limit) return;
+#else
+    vptr += row_inc; if(vptr > limit) return;
+#endif
+    *vptr++ = b = cb->b[2]; *vptr++ = g = cb->g[2]; *vptr++ = r = cb->r[2];
+    *vptr++ = b; *vptr++ = g; *vptr++ = r;
+    *vptr++ = b = cb->b[3]; *vptr++ = g = cb->g[3]; *vptr++ = r = cb->r[3];
+    *vptr++ = b; *vptr++ = g; *vptr++ = r;
+}
+
+
+/* ------------------------------------------------------------------------ */
+void cvid_v4_24(unsigned char *vptr, unsigned char *limit, int stride, cvid_codebook *cb0,
+    cvid_codebook *cb1, cvid_codebook *cb2, cvid_codebook *cb3)
+{
+#ifndef ORIGINAL
+int row_inc = stride+4*3;
+#else
+int row_inc = stride-4*3;
+#endif
+
+#ifndef ORIGINAL
+    vptr += (3*row_inc);
+#endif
+    *vptr++ = cb0->b[0]; *vptr++ = cb0->g[0]; *vptr++ = cb0->r[0];
+    *vptr++ = cb0->b[1]; *vptr++ = cb0->g[1]; *vptr++ = cb0->r[1];
+    *vptr++ = cb1->b[0]; *vptr++ = cb1->g[0]; *vptr++ = cb1->r[0];
+    *vptr++ = cb1->b[1]; *vptr++ = cb1->g[1]; *vptr++ = cb1->r[1];
+#ifndef ORIGINAL
+    vptr -= row_inc; if(vptr < limit) return;
+#else
+    vptr += row_inc; if(vptr > limit) return;
+#endif
+    *vptr++ = cb0->b[2]; *vptr++ = cb0->g[2]; *vptr++ = cb0->r[2];
+    *vptr++ = cb0->b[3]; *vptr++ = cb0->g[3]; *vptr++ = cb0->r[3];
+    *vptr++ = cb1->b[2]; *vptr++ = cb1->g[2]; *vptr++ = cb1->r[2];
+    *vptr++ = cb1->b[3]; *vptr++ = cb1->g[3]; *vptr++ = cb1->r[3];
+#ifndef ORIGINAL
+    vptr -= row_inc; if(vptr < limit) return;
+#else
+    vptr += row_inc; if(vptr > limit) return;
+#endif
+    *vptr++ = cb2->b[0]; *vptr++ = cb2->g[0]; *vptr++ = cb2->r[0];
+    *vptr++ = cb2->b[1]; *vptr++ = cb2->g[1]; *vptr++ = cb2->r[1];
+    *vptr++ = cb3->b[0]; *vptr++ = cb3->g[0]; *vptr++ = cb3->r[0];
+    *vptr++ = cb3->b[1]; *vptr++ = cb3->g[1]; *vptr++ = cb3->r[1];
+#ifndef ORIGINAL
+    vptr -= row_inc; if(vptr < limit) return;
+#else
+    vptr += row_inc; if(vptr > limit) return;
+#endif
+    *vptr++ = cb2->b[2]; *vptr++ = cb2->g[2]; *vptr++ = cb2->r[2];
+    *vptr++ = cb2->b[3]; *vptr++ = cb2->g[3]; *vptr++ = cb2->r[3];
+    *vptr++ = cb3->b[2]; *vptr++ = cb3->g[2]; *vptr++ = cb3->r[2];
+    *vptr++ = cb3->b[3]; *vptr++ = cb3->g[3]; *vptr++ = cb3->r[3];
+}
+
+
+/* ------------------------------------------------------------------------
+ * Call this function once at the start of the sequence and save the
+ * returned context for calls to decode_cinepak().
+ */
+cinepak_info *decode_cinepak_init(void)
+{
+    cinepak_info *cvinfo;
+    int i;
+
+    cvinfo = ICCVID_Alloc( sizeof (cinepak_info), 1 );
+    if( !cvinfo )
+        return NULL;
+    cvinfo->strip_num = 0;
+
+    if(uiclp == NULL)
+    {
+        uiclp = uiclip+512;
+        for(i = -512; i < 512; i++)
+            uiclp[i] = (i < 0 ? 0 : (i > 255 ? 255 : i));
+    }
+
+    return cvinfo;
+}
+
+void free_cvinfo( cinepak_info *cvinfo )
+{
+    int i;
+
+    for( i=0; i<cvinfo->strip_num; i++ )
+    {
+        ICCVID_Free(cvinfo->v4_codebook[i]);
+        ICCVID_Free(cvinfo->v1_codebook[i]);
+    }
+    ICCVID_Free( cvinfo );
+}
+
+typedef void (*fn_read_codebook)(cvid_codebook *c, int mode);
+typedef void (*fn_cvid_v1)(unsigned char *frm, unsigned char *limit,
+                           int stride, cvid_codebook *cb);
+typedef void (*fn_cvid_v4)(unsigned char *frm, unsigned char *limit, int stride,
+                           cvid_codebook *cb0, cvid_codebook *cb1,
+                           cvid_codebook *cb2, cvid_codebook *cb3);
+
+/* ------------------------------------------------------------------------
+ * This function decodes a buffer containing a Cinepak encoded frame.
+ *
+ * context - the context created by decode_cinepak_init().
+ * buf - the input buffer to be decoded
+ * size - the size of the input buffer
+ * frame - the output frame buffer (24 or 32 bit per pixel)
+ * width - the width of the output frame
+ * height - the height of the output frame
+ * bit_per_pixel - the number of bits per pixel allocated to the output
+ *   frame (only 24 or 32 bpp are supported)
+ */
+void decode_cinepak(cinepak_info *cvinfo, unsigned char *buf, int size,
+           unsigned char *frame, int width, int height, int bit_per_pixel)
+{
+    cvid_codebook *v4_codebook, *v1_codebook, *codebook = NULL;
+    unsigned long x, y, y_bottom, frame_flags, strips, cv_width, cv_height,
+                  cnum, strip_id, chunk_id, x0, y0, x1, y1, ci, flag, mask;
+    long len, top_size, chunk_size;
+    unsigned char *frm_ptr, *frm_end;
+    int i, cur_strip, d0, d1, d2, d3, frm_stride, bpp = 3;
+    fn_read_codebook read_codebook = read_codebook_24;
+    fn_cvid_v1 cvid_v1 = cvid_v1_24;
+    fn_cvid_v4 cvid_v4 = cvid_v4_24;
+
+    x = y = 0;
+    y_bottom = 0;
+    in_buffer = buf;
+
+    frame_flags = get_byte();
+    len = get_byte() << 16;
+    len |= get_byte() << 8;
+    len |= get_byte();
+
+    switch(bit_per_pixel)
+        {
+        case 24:
+            bpp = 3;
+            read_codebook = read_codebook_24;
+            cvid_v1 = cvid_v1_24;
+            cvid_v4 = cvid_v4_24;
+            break;
+        case 32:
+            bpp = 4;
+            read_codebook = read_codebook_32;
+            cvid_v1 = cvid_v1_32;
+            cvid_v4 = cvid_v4_32;
+            break;
+        }
+
+    frm_stride = width * bpp;
+    frm_ptr = frame;
+    frm_end = frm_ptr + width * height * bpp;
+
+    if(len != size)
+        {
+        if(len & 0x01) len++; /* AVIs tend to have a size mismatch */
+        if(len != size)
+            {
+            ERR("CVID: corruption %d (QT/AVI) != %ld (CV)\n", size, len);
+            /* return; */
+            }
+        }
+
+    cv_width = get_word();
+    cv_height = get_word();
+    strips = get_word();
+
+    if(strips > cvinfo->strip_num)
+        {
+        if(strips >= MAX_STRIPS)
+            {
+            ERR("CVID: strip overflow (more than %d)\n", MAX_STRIPS);
+            return;
+            }
+
+        for(i = cvinfo->strip_num; i < strips; i++)
+            {
+            if((cvinfo->v4_codebook[i] = (cvid_codebook *)ICCVID_Alloc(sizeof(cvid_codebook), 260)) == NULL)
+                {
+                ERR("CVID: codebook v4 alloc err\n");
+                return;
+                }
+
+            if((cvinfo->v1_codebook[i] = (cvid_codebook *)ICCVID_Alloc(sizeof(cvid_codebook), 260)) == NULL)
+                {
+                ERR("CVID: codebook v1 alloc err\n");
+                return;
+                }
+            }
+        }
+    cvinfo->strip_num = strips;
+
+    TRACE("CVID: <%ld,%ld> strips %ld\n", cv_width, cv_height, strips);
+
+    for(cur_strip = 0; cur_strip < strips; cur_strip++)
+        {
+        v4_codebook = cvinfo->v4_codebook[cur_strip];
+        v1_codebook = cvinfo->v1_codebook[cur_strip];
+
+        if((cur_strip > 0) && (!(frame_flags & 0x01)))
+            {
+            memcpy(cvinfo->v4_codebook[cur_strip], cvinfo->v4_codebook[cur_strip-1], 260 * sizeof(cvid_codebook));
+            memcpy(cvinfo->v1_codebook[cur_strip], cvinfo->v1_codebook[cur_strip-1], 260 * sizeof(cvid_codebook));
+            }
+
+        strip_id = get_word();        /* 1000 = key strip, 1100 = iter strip */
+        top_size = get_word();
+        y0 = get_word();        /* FIXME: most of these are ignored at the moment */
+        x0 = get_word();
+        y1 = get_word();
+        x1 = get_word();
+
+        y_bottom += y1;
+        top_size -= 12;
+        x = 0;
+        if(x1 != width)
+            WARN("CVID: Warning x1 (%ld) != width (%d)\n", x1, width);
+
+        TRACE("   %d) %04lx %04ld <%ld,%ld> <%ld,%ld> yt %ld\n",
+              cur_strip, strip_id, top_size, x0, y0, x1, y1, y_bottom);
+
+        while(top_size > 0)
+            {
+            chunk_id  = get_word();
+            chunk_size = get_word();
+
+            TRACE("        %04lx %04ld\n", chunk_id, chunk_size);
+            top_size -= chunk_size;
+            chunk_size -= 4;
+
+            switch(chunk_id)
+                {
+                    /* -------------------- Codebook Entries -------------------- */
+                case 0x2000:
+                case 0x2200:
+                    codebook = (chunk_id == 0x2200 ? v1_codebook : v4_codebook);
+                    cnum = chunk_size/6;
+                    for(i = 0; i < cnum; i++) read_codebook(codebook+i, 0);
+                    break;
+
+                case 0x2400:
+                case 0x2600:        /* 8 bit per pixel */
+                    codebook = (chunk_id == 0x2600 ? v1_codebook : v4_codebook);
+                    cnum = chunk_size/4;
+                    for(i = 0; i < cnum; i++) read_codebook(codebook+i, 1);
+                    break;
+
+                case 0x2100:
+                case 0x2300:
+                    codebook = (chunk_id == 0x2300 ? v1_codebook : v4_codebook);
+
+                    ci = 0;
+                    while(chunk_size > 0)
+                        {
+                        flag = get_long();
+                        chunk_size -= 4;
+
+                        for(i = 0; i < 32; i++)
+                            {
+                            if(flag & 0x80000000)
+                                {
+                                chunk_size -= 6;
+                                read_codebook(codebook+ci, 0);
+                                }
+
+                            ci++;
+                            flag <<= 1;
+                            }
+                        }
+                    while(chunk_size > 0) { skip_byte(); chunk_size--; }
+                    break;
+
+                case 0x2500:
+                case 0x2700:        /* 8 bit per pixel */
+                    codebook = (chunk_id == 0x2700 ? v1_codebook : v4_codebook);
+
+                    ci = 0;
+                    while(chunk_size > 0)
+                        {
+                        flag = get_long();
+                        chunk_size -= 4;
+
+                        for(i = 0; i < 32; i++)
+                            {
+                            if(flag & 0x80000000)
+                                {
+                                chunk_size -= 4;
+                                read_codebook(codebook+ci, 1);
+                                }
+
+                            ci++;
+                            flag <<= 1;
+                            }
+                        }
+                    while(chunk_size > 0) { skip_byte(); chunk_size--; }
+                    break;
+
+                    /* -------------------- Frame -------------------- */
+                case 0x3000:
+                    while((chunk_size > 0) && (y < y_bottom))
+                        {
+                        flag = get_long();
+                        chunk_size -= 4;
+
+                        for(i = 0; i < 32; i++)
+                            {
+                            if(y >= y_bottom) break;
+                            if(flag & 0x80000000)    /* 4 bytes per block */
+                                {
+                                d0 = get_byte();
+                                d1 = get_byte();
+                                d2 = get_byte();
+                                d3 = get_byte();
+                                chunk_size -= 4;
+#ifdef ORIGINAL
+                                cvid_v4(frm_ptr + (y * frm_stride + x * bpp), frm_end, frm_stride, v4_codebook+d0, v4_codebook+d1, v4_codebook+d2, v4_codebook+d3);
+#else
+                                cvid_v4(frm_ptr + ((height - 1 - y) * frm_stride + x * bpp), frame, frm_stride, v4_codebook+d0, v4_codebook+d1, v4_codebook+d2, v4_codebook+d3);
+#endif
+                                }
+                            else        /* 1 byte per block */
+                                {
+#ifdef ORIGINAL
+                                cvid_v1(frm_ptr + (y * frm_stride + x * bpp), frm_end, frm_stride, v1_codebook + get_byte());
+#else
+                                cvid_v1(frm_ptr + ((height - 1 - y) * frm_stride + x * bpp), frame, frm_stride, v1_codebook + get_byte());
+#endif
+                                chunk_size--;
+                                }
+
+                            x += 4;
+                            if(x >= width)
+                                {
+                                x = 0;
+                                y += 4;
+                                }
+                            flag <<= 1;
+                            }
+                        }
+                    while(chunk_size > 0) { skip_byte(); chunk_size--; }
+                    break;
+
+                case 0x3100:
+                    while((chunk_size > 0) && (y < y_bottom))
+                        {
+                            /* ---- flag bits: 0 = SKIP, 10 = V1, 11 = V4 ---- */
+                        flag = (unsigned long)get_long();
+                        chunk_size -= 4;
+                        mask = 0x80000000;
+
+                        while((mask) && (y < y_bottom))
+                            {
+                            if(flag & mask)
+                                {
+                                if(mask == 1)
+                                    {
+                                    if(chunk_size < 0) break;
+                                    flag = (unsigned long)get_long();
+                                    chunk_size -= 4;
+                                    mask = 0x80000000;
+                                    }
+                                else mask >>= 1;
+
+                                if(flag & mask)        /* V4 */
+                                    {
+                                    d0 = get_byte();
+                                    d1 = get_byte();
+                                    d2 = get_byte();
+                                    d3 = get_byte();
+                                    chunk_size -= 4;
+#ifdef ORIGINAL
+                                    cvid_v4(frm_ptr + (y * frm_stride + x * bpp), frm_end, frm_stride, v4_codebook+d0, v4_codebook+d1, v4_codebook+d2, v4_codebook+d3);
+#else
+                                    cvid_v4(frm_ptr + ((height - 1 - y) * frm_stride + x * bpp), frame, frm_stride, v4_codebook+d0, v4_codebook+d1, v4_codebook+d2, v4_codebook+d3);
+#endif
+                                    }
+                                else        /* V1 */
+                                    {
+                                    chunk_size--;
+#ifdef ORIGINAL
+                                    cvid_v1(frm_ptr + (y * frm_stride + x * bpp), frm_end, frm_stride, v1_codebook + get_byte());
+#else
+                                    cvid_v1(frm_ptr + ((height - 1 - y) * frm_stride + x * bpp), frame, frm_stride, v1_codebook + get_byte());
+#endif
+                                    }
+                                }        /* else SKIP */
+
+                            mask >>= 1;
+                            x += 4;
+                            if(x >= width)
+                                {
+                                x = 0;
+                                y += 4;
+                                }
+                            }
+                        }
+
+                    while(chunk_size > 0) { skip_byte(); chunk_size--; }
+                    break;
+
+                case 0x3200:        /* each byte is a V1 codebook */
+                    while((chunk_size > 0) && (y < y_bottom))
+                        {
+#ifdef ORIGINAL
+                        cvid_v1(frm_ptr + (y * frm_stride + x * bpp), frm_end, frm_stride, v1_codebook + get_byte());
+#else
+                        cvid_v1(frm_ptr + ((height - 1 - y) * frm_stride + x * bpp), frame, frm_stride, v1_codebook + get_byte());
+#endif
+                        chunk_size--;
+                        x += 4;
+                        if(x >= width)
+                            {
+                            x = 0;
+                            y += 4;
+                            }
+                        }
+                    while(chunk_size > 0) { skip_byte(); chunk_size--; }
+                    break;
+
+                default:
+                    ERR("CVID: unknown chunk_id %08lx\n", chunk_id);
+                    while(chunk_size > 0) { skip_byte(); chunk_size--; }
+                    break;
+                }
+            }
+        }
+
+    if(len != size)
+        {
+        if(len & 0x01) len++; /* AVIs tend to have a size mismatch */
+        if(len != size)
+            {
+            long xlen;
+            skip_byte();
+            xlen = get_byte() << 16;
+            xlen |= get_byte() << 8;
+            xlen |= get_byte(); /* Read Len */
+            WARN("CVID: END INFO chunk size %d cvid size1 %ld cvid size2 %ld\n",
+                  size, len, xlen);
+            }
+        }
+}
+
+LRESULT ICCVID_DecompressQuery( ICCVID_Info *info, LPBITMAPINFO in, LPBITMAPINFO out )
+{
+    TRACE("ICM_DECOMPRESS_QUERY %p %p %p\n", info, in, out);
+
+    if( (info==NULL) || (info->dwMagic!=ICCVID_MAGIC) )
+        return ICERR_BADPARAM;
+
+    TRACE("planes = %d\n", in->bmiHeader.biPlanes );
+    TRACE("bpp    = %d\n", in->bmiHeader.biBitCount );
+    TRACE("height = %ld\n", in->bmiHeader.biHeight );
+    TRACE("width  = %ld\n", in->bmiHeader.biWidth );
+    TRACE("compr  = %lx\n", in->bmiHeader.biCompression );
+
+    if( in->bmiHeader.biCompression != ICCVID_MAGIC )
+        return ICERR_UNSUPPORTED;
+
+    switch( in->bmiHeader.biBitCount )
+    {
+    case 24:
+    case 32:
+        break;
+    default:
+        TRACE("bitcount = %d\n", in->bmiHeader.biBitCount );
+        return ICERR_UNSUPPORTED;
+    }
+
+    if( out )
+        return ICERR_UNSUPPORTED;
+
+    return ICERR_OK;
+}
+
+LRESULT ICCVID_DecompressGetFormat( ICCVID_Info *info, LPBITMAPINFO in, LPBITMAPINFO out )
+{
+    TRACE("ICM_DECOMPRESS_GETFORMAT %p %p %p\n", info, in, out);
+
+    if( (info==NULL) || (info->dwMagic!=ICCVID_MAGIC) )
+        return ICERR_BADPARAM;
+
+    if( out )
+    {
+        memcpy( out, in, sizeof (BITMAPINFO) );
+        out->bmiHeader.biCompression = BI_RGB;
+        out->bmiHeader.biSizeImage = in->bmiHeader.biHeight
+                                   * in->bmiHeader.biWidth *4;
+    }
+
+    return sizeof (BITMAPINFO);
+}
+
+LRESULT ICCVID_DecompressBegin( ICCVID_Info *info, LPBITMAPINFO in, LPBITMAPINFO out )
+{
+    TRACE("ICM_DECOMPRESS_BEGIN %p %p %p\n", info, in, out);
+
+    if( (info==NULL) || (info->dwMagic!=ICCVID_MAGIC) )
+        return ICERR_BADPARAM;
+
+    if( info->cvinfo )
+        free_cvinfo( info->cvinfo );
+    info->cvinfo = decode_cinepak_init();
+
+    return ICERR_OK;
+}
+
+LRESULT ICCVID_Decompress( ICCVID_Info *info, ICDECOMPRESS *icd, DWORD size )
+{
+    LONG width, height;
+    WORD bit_per_pixel;
+
+    TRACE("ICM_DECOMPRESS %p %p %ld\n", info, icd, size);
+
+    if( (info==NULL) || (info->dwMagic!=ICCVID_MAGIC) )
+        return ICERR_BADPARAM;
+
+    width  = icd->lpbiInput->biWidth;
+    height = icd->lpbiInput->biHeight;
+    bit_per_pixel = icd->lpbiInput->biBitCount;
+
+    decode_cinepak(info->cvinfo, icd->lpInput, icd->lpbiInput->biSizeImage,
+                   icd->lpOutput, width, height, bit_per_pixel);
+
+    return ICERR_OK;
+}
+
+LRESULT ICCVID_Close( ICCVID_Info *info )
+{
+    if( (info==NULL) || (info->dwMagic!=ICCVID_MAGIC) )
+        return 0;
+    if( info->cvinfo )
+        free_cvinfo( info->cvinfo );
+    ICCVID_Free( info );
+    return 1;
+}
+
+LRESULT WINAPI ICCVID_DriverProc( DWORD dwDriverId, HDRVR hdrvr, UINT msg,
+                                  LONG lParam1, LONG lParam2)
+{
+    ICCVID_Info *info = (ICCVID_Info *) dwDriverId;
+
+    TRACE("%ld %p %d %ld %ld\n", dwDriverId, hdrvr, msg, lParam1, lParam2);
+
+    switch( msg )
+    {
+    case DRV_LOAD:
+        TRACE("Loaded\n");
+        return 1;
+    case DRV_ENABLE:
+        return 0;
+
+    case DRV_OPEN:
+        TRACE("Opened\n");
+        info = ICCVID_Alloc( sizeof (ICCVID_Info), 1 );
+        if( info )
+        {
+            info->dwMagic = ICCVID_MAGIC;
+            info->cvinfo = NULL;
+        }
+        return (LRESULT) info;
+
+    case ICM_DECOMPRESS_QUERY:
+        return ICCVID_DecompressQuery( info, (LPBITMAPINFO) lParam1,
+                                       (LPBITMAPINFO) lParam2 );
+    case ICM_DECOMPRESS_GET_FORMAT:
+        return ICCVID_DecompressGetFormat( info, (LPBITMAPINFO) lParam1,
+                                       (LPBITMAPINFO) lParam2 );
+    case ICM_DECOMPRESS_BEGIN:
+        return ICCVID_DecompressBegin( info, (LPBITMAPINFO) lParam1,
+                                       (LPBITMAPINFO) lParam2 );
+    case ICM_DECOMPRESS:
+        return ICCVID_Decompress( info, (ICDECOMPRESS*) lParam1,
+                                  (DWORD) lParam2 );
+    case DRV_CLOSE:
+        return ICCVID_Close( info );
+
+    default:
+        FIXME("Unknown message: %d %ld %ld\n", msg, lParam1, lParam2);
+    }
+    return 0;
+}
diff --git a/dlls/iccvid/iccvid.spec b/dlls/iccvid/iccvid.spec
new file mode 100644
index 0000000000000000000000000000000000000000..c2ef71c704b3c6e2232160068373c87894facb7b
--- /dev/null
+++ b/dlls/iccvid/iccvid.spec
@@ -0,0 +1 @@
+@ stdcall DriverProc(long ptr long long long) ICCVID_DriverProc