diff options
| author | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-12-11 23:29:24 +0000 |
|---|---|---|
| committer | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-12-11 23:29:24 +0000 |
| commit | 73226c73b01b80b7fe848500ee862caa73775518 (patch) | |
| tree | 92536ad555b3e002017a244afa75f58bc279a26d /loader/dshow/guids.h | |
| parent | e2f3778cb0ba8aa7df837d66a53833bdd3a63bb2 (diff) | |
| download | mpv-73226c73b01b80b7fe848500ee862caa73775518.tar.bz2 mpv-73226c73b01b80b7fe848500ee862caa73775518.tar.xz | |
avifile sync
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@3468 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'loader/dshow/guids.h')
| -rw-r--r-- | loader/dshow/guids.h | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/loader/dshow/guids.h b/loader/dshow/guids.h index 2d38d51f95..1c6355b389 100644 --- a/loader/dshow/guids.h +++ b/loader/dshow/guids.h @@ -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 @@ typedef struct _MediaType 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 |