[Mplayer-cvslog] CVS: main/loader/wine vfw.h,1.1.1.1,1.2 windef.h,1.1.1.1,1.2

[GEREOFFY]

Update of /cvsroot/mplayer/main/loader/wine
In directory usw-pr-cvs1:/tmp/cvs-serv32507/wine

Modified Files:
	vfw.h windef.h 
Log Message:
DLL loader updated from avifile-0.60beta4

Index: vfw.h
===================================================================
RCS file: /cvsroot/mplayer/main/loader/wine/vfw.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** vfw.h	2001/02/24 20:30:35	1.1.1.1
--- vfw.h	2001/03/18 01:01:03	1.2
***************
*** 16,19 ****
--- 16,21 ----
  } BITMAPFILEHEADER;
  
+ #ifndef _BITMAPINFOHEADER_
+ #define _BITMAPINFOHEADER_
  typedef struct
  {
***************
*** 35,38 ****
--- 37,42 ----
  } BITMAPINFO, *LPBITMAPINFO;
  #endif
+ 
+ #endif
  #define VFWAPI	
  #define VFWAPIV	
***************
*** 603,627 ****
  
  typedef struct {
!     long		cbSize;		// set to sizeof(COMPVARS) before
! 					// calling ICCompressorChoose
!     long		dwFlags;	// see below...
!     HIC			hic;		// HIC of chosen compressor
!     long               fccType;	// basically ICTYPE_VIDEO
!     long               fccHandler;	// handler of chosen compressor or
! 					// "" or "DIB "
!     LPBITMAPINFO	lpbiIn;		// input format
!     LPBITMAPINFO	lpbiOut;	// output format - will compress to this
!     void*		lpBitsOut;
!     void*		lpBitsPrev;
!     long		lFrame;
!     long		lKey;		// key frames how often?
!     long		lDataRate;	// desired data rate KB/Sec
!     long		lQ;		// desired quality
!     long		lKeyCount;
!     void*		lpState;	// state of compressor
!     long		cbState;	// size of the state
! } COMPVARS, *PCOMPVARS;
! 
! // FLAGS for dwFlags element of COMPVARS structure:
  
  
--- 607,631 ----
  
  typedef struct {
!     long		cbSize;		// set to sizeof(COMPVARS) before
! 					// calling ICCompressorChoose
!     long		dwFlags;	// see below...
!     HIC			hic;		// HIC of chosen compressor
!     long               fccType;	// basically ICTYPE_VIDEO
!     long               fccHandler;	// handler of chosen compressor or
! 					// "" or "DIB "
!     LPBITMAPINFO	lpbiIn;		// input format
!     LPBITMAPINFO	lpbiOut;	// output format - will compress to this
!     void*		lpBitsOut;
!     void*		lpBitsPrev;
!     long		lFrame;
!     long		lKey;		// key frames how often?
!     long		lDataRate;	// desired data rate KB/Sec
!     long		lQ;		// desired quality
!     long		lKeyCount;
!     void*		lpState;	// state of compressor
!     long		cbState;	// size of the state
! } COMPVARS, *PCOMPVARS;
! 
! // FLAGS for dwFlags element of COMPVARS structure:
  
  

Index: windef.h
===================================================================
RCS file: /cvsroot/mplayer/main/loader/wine/windef.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** windef.h	2001/02/24 20:30:41	1.1.1.1
--- windef.h	2001/03/18 01:01:03	1.2
***************
*** 114,118 ****
  #  endif
  # else
! //#  error You need gcc >= 2.7 to build Wine on a 386
  # endif
  #else 
--- 114,118 ----
  #  endif
  # else
! #  error You need gcc >= 2.7 to build Wine on a 386
  # endif
  #else 
***************
*** 167,172 ****
  typedef double          DATE;
  typedef double          DOUBLE;
! typedef double          LONGLONG;
! typedef double          ULONGLONG;
  
  /* FIXME: Wine does not compile with strict on, therefore strict
--- 167,172 ----
  typedef double          DATE;
  typedef double          DOUBLE;
! typedef long long       LONGLONG;
! typedef unsigned long long   ULONGLONG;
  
  /* FIXME: Wine does not compile with strict on, therefore strict


_______________________________________________
Mplayer-cvslog mailing list
Mplayer-cvslog at lists.sourceforge.net
http://lists.sourceforge.net/lists/listinfo/mplayer-cvslog