update win32 codec loading code

- shiny new win32 crap from avifile and mplayer!
- shiny new compilation warnings!
- use directshow filter to decode msmpeg v1/v2
- disable SYNC_SHUTDOWN ugly hack (will be removed soon, i hope)

CVS patchset: 2114
CVS date: 2002/06/21 01:44:17

1 files changed, 6 insertions, 9 deletions

diff --git a/src/libw32dll/wine/vfw.h b/src/libw32dll/wine/vfw.h
index 37983db3d..7889a1822 100644
--- a/src/libw32dll/wine/vfw.h
+++ b/src/libw32dll/wine/vfw.h
@@ -1,13 +1,12 @@
 #ifndef __WINE_VFW_H
 #define __WINE_VFW_H
-#define D_VFW 1
 //#include "pshpack1.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
 #ifndef __WINE_WINGDI_H
 
-typedef struct
+typedef struct __attribute__((__packed__))
 {
     short    bfType;
     long   bfSize;
@@ -18,7 +17,7 @@ typedef struct
 
 #ifndef _BITMAPINFOHEADER_
 #define _BITMAPINFOHEADER_
-typedef struct
+typedef struct __attribute__((__packed__))
 {
     long 	biSize;
     long  	biWidth;
@@ -215,10 +214,10 @@ typedef struct {
 } ICCOMPRESS;
 
 long VFWAPIV ICCompress(
-	HIC hic,long dwFlags,LPBITMAPINFOHEADER lpbiOutput,void* lpData,
-	LPBITMAPINFOHEADER lpbiInput,void* lpBits,long* lpckid,
+	HIC hic,long dwFlags,LPBITMAPINFOHEADER lpbiOutput,void* lpOutputBuf,
+	LPBITMAPINFOHEADER lpbiInput,void* lpImage,long* lpckid,
 	long* lpdwFlags,long lFrameNum,long dwFrameSize,long dwQuality,
-	LPBITMAPINFOHEADER lpbiPrev,void* lpPrev
+	LPBITMAPINFOHEADER lpbiInputPrev,void* lpImagePrev
 );
 
 
@@ -381,9 +380,7 @@ typedef struct {
 
 
 long VFWAPIV ICDecompress(HIC hic,long dwFlags,LPBITMAPINFOHEADER lpbiFormat,void* lpData,LPBITMAPINFOHEADER lpbi,void* lpBits);
-
 long VFWAPIV ICDecompressEx(HIC hic,long dwFlags,LPBITMAPINFOHEADER lpbiFormat,void* lpData,LPBITMAPINFOHEADER lpbi,void* lpBits);
-
 long VFWAPIV ICUniversalEx(HIC hic,int command,LPBITMAPINFOHEADER lpbiFormat,LPBITMAPINFOHEADER lpbi);
 
 
@@ -410,7 +407,7 @@ long VFWAPIV ICUniversalEx(HIC hic,int command,LPBITMAPINFOHEADER lpbiFormat,LPB
     	hic,ICM_DECOMPRESSEX_QUERY, (lpbiInput),		\
 	(lpbiOutput)						\
     )
-    
+
 #define ICDecompressGetFormat(hic, lpbiInput, lpbiOutput)		\
     ((long)ICSendMessage(						\
     	hic,ICM_DECOMPRESS_GET_FORMAT, (long)(void*)(lpbiInput),	\