diff loader/dshow/guids.h @ 3467:e3bbf44dbab2

avifile sync

--- a/loader/dshow/guids.h	Tue Dec 11 23:29:11 2001 +0000
+++ b/loader/dshow/guids.h	Tue Dec 11 23:29:24 2001 +0000
@@ -2,13 +2,14 @@
 #define GUIDS_H
 
 #include "com.h"
-#include "wine/winbase.h"
+#include "wine/module.h"
+#include "wine/windef.h"
 #include "wine/vfw.h"
 
 extern int DSHOW_DEBUG;
 #define Debug if(DSHOW_DEBUG)
 
-typedef struct  _MediaType
+typedef struct __attribute__((__packed__)) _MediaType
 {
     GUID	majortype;		//0x0
     GUID	subtype;		//0x10
@@ -18,30 +19,31 @@
     GUID	formattype;		//0x2c
     IUnknown*	pUnk;			//0x3c
     unsigned long cbFormat;		//0x40
-    char	*pbFormat;		//0x44
+    char*	pbFormat;		//0x44
 } AM_MEDIA_TYPE;
 
 typedef enum
 {
-    PINDIR_INPUT	= 0,
-    PINDIR_OUTPUT	= PINDIR_INPUT + 1
+    PINDIR_INPUT = 0,
+    PINDIR_OUTPUT
 } PIN_DIRECTION;
 
 typedef long long REFERENCE_TIME;
 
-typedef struct RECT32
+typedef struct __attribute__((__packed__)) RECT32
 {
     int left, top, right, bottom;
 } RECT32;
 
-typedef struct tagVIDEOINFOHEADER {
+typedef struct __attribute__((__packed__)) tagVIDEOINFOHEADER {
 
     RECT32            rcSource;          // The bit we really want to use
     RECT32            rcTarget;          // Where the video should go
     unsigned long     dwBitRate;         // Approximate bit data rate
     unsigned long     dwBitErrorRate;    // Bit error rate for this stream
     REFERENCE_TIME    AvgTimePerFrame;   // Average time per frame (100ns units)
-    BITMAPINFOHEADER bmiHeader;
+    BITMAPINFOHEADER  bmiHeader;
+    //int               reserved[3];
 } VIDEOINFOHEADER;
 
 typedef struct _AllocatorProperties