Mercurial > mxe-octave

comparison src/w32api-2-directx-additions-for-qt.patch @ 901:6178b1548a2f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
leave DUMMYUNIONNAME in ddraw.h alone in the first place for package w32api It is no longer necessary to change "DUMMYUNIONNAME" to "u" in ddraw.h since the latest fix for SDL. So we just leave "DUMMYUNIONNAME" alone instead of changing it to "u" and back again.
author Mark Brand <mabrand@mabrand.nl>
date Sun, 25 Apr 2010 13:20:30 +0200
parents fc3bc276296a
children 19f3dc1517c1
comparison
equal deleted inserted replaced
900:27fc875921a2 901:6178b1548a2f
15 unzip -j MinGW-gcc440_1.zip 'mingw/_patches/include.zip' 15 unzip -j MinGW-gcc440_1.zip 'mingw/_patches/include.zip'
16 unzip -aa -p include.zip '*.patch' | patch -d b/include -p1 16 unzip -aa -p include.zip '*.patch' | patch -d b/include -p1
17 (cd b/include; unzip -aa ../../include.zip '*.h') 17 (cd b/include; unzip -aa ../../include.zip '*.h')
18 # The ddraw.h we got from Qt is not enough to build SDL. 18 # The ddraw.h we got from Qt is not enough to build SDL.
19 # This one from Wine/KDE-Win works for both SDL and Qt 19 # This one from Wine/KDE-Win works for both SDL and Qt
20 # after a little fixing up. 20 # but we have to comment out some Wine-specific stuff.
21 cat 'ddraw.h?revision=987475' \ 21 cat 'ddraw.h?revision=987475' \
22 | sed 's/DUMMYUNIONNAME/u/g;' \
23 | sed 's,.*WINELIB.*,/* & */,g;' \ 22 | sed 's,.*WINELIB.*,/* & */,g;' \
24 > b/include/ddraw.h 23 > b/include/ddraw.h
25 diff -ruN a b > w32api-2-directx-additions-for-qt.patch 24 diff -ruN a b > w32api-2-directx-additions-for-qt.patch
26 rm -rf a b include.zip 25 rm -rf a b include.zip
27 rm -f w32api-3.13-mingw32-dev.tar.gz MinGW-gcc440_1.zip 'ddraw.h?revision=987475' 26 rm -f w32api-3.13-mingw32-dev.tar.gz MinGW-gcc440_1.zip 'ddraw.h?revision=987475'
28 #--------------------------------------------------------------------# 27 #--------------------------------------------------------------------#
29 28
30 29
31 diff -ruN a/include/amvideo.h b/include/amvideo.h 30 diff -ruN a/include/amvideo.h b/include/amvideo.h
32 --- a/include/amvideo.h 2008-12-06 03:31:53.000000000 +0100 31 --- a/include/amvideo.h 2008-12-06 03:31:53.000000000 +0100
33 +++ b/include/amvideo.h 2010-04-14 21:08:32.363036508 +0200 32 +++ b/include/amvideo.h 2010-04-25 13:03:46.887145541 +0200
34 @@ -52,10 +52,10 @@ 33 @@ -52,10 +52,10 @@
35 BITMAPINFOHEADER bmiHeader; 34 BITMAPINFOHEADER bmiHeader;
36 } VIDEOINFOHEADER; 35 } VIDEOINFOHEADER;
37 typedef struct tagVIDEOINFO { 36 typedef struct tagVIDEOINFO {
38 - RECT rcSource, 37 - RECT rcSource,
46 REFERENCE_TIME AvgTimePerFrame; 45 REFERENCE_TIME AvgTimePerFrame;
47 BITMAPINFOHEADER bmiHeader; 46 BITMAPINFOHEADER bmiHeader;
48 union { 47 union {
49 diff -ruN a/include/bdatypes.h b/include/bdatypes.h 48 diff -ruN a/include/bdatypes.h b/include/bdatypes.h
50 --- a/include/bdatypes.h 2008-12-06 03:31:53.000000000 +0100 49 --- a/include/bdatypes.h 2008-12-06 03:31:53.000000000 +0100
51 +++ b/include/bdatypes.h 2010-04-14 21:08:32.363036508 +0200 50 +++ b/include/bdatypes.h 2010-04-25 13:03:46.887145541 +0200
52 @@ -17,9 +17,9 @@ 51 @@ -17,9 +17,9 @@
53 } MEDIA_SAMPLE_CONTENT; 52 } MEDIA_SAMPLE_CONTENT;
54 /*--- DirectShow Reference - DirectShow Structures */ 53 /*--- DirectShow Reference - DirectShow Structures */
55 typedef struct { 54 typedef struct {
56 - DWORD dwOffset 55 - DWORD dwOffset
62 } MPEG2_TRANSPORT_STRIDE; 61 } MPEG2_TRANSPORT_STRIDE;
63 typedef struct { 62 typedef struct {
64 ULONG ulPID; 63 ULONG ulPID;
65 diff -ruN a/include/control.h b/include/control.h 64 diff -ruN a/include/control.h b/include/control.h
66 --- a/include/control.h 2008-12-06 03:31:54.000000000 +0100 65 --- a/include/control.h 2008-12-06 03:31:54.000000000 +0100
67 +++ b/include/control.h 2010-04-14 21:08:32.363036508 +0200 66 +++ b/include/control.h 2010-04-25 13:03:46.887145541 +0200
68 @@ -11,7 +11,63 @@ 67 @@ -11,7 +11,63 @@
69 /*--- DirectShow Reference - DirectShow Data Types */ 68 /*--- DirectShow Reference - DirectShow Data Types */
70 typedef LONG_PTR OAEVENT; 69 typedef LONG_PTR OAEVENT;
71 typedef LONG_PTR OAHWND; 70 typedef LONG_PTR OAHWND;
72 +typedef LONG OAFilterState; 71 +typedef LONG OAFilterState;
129 #ifdef __cplusplus 128 #ifdef __cplusplus
130 } 129 }
131 #endif 130 #endif
132 diff -ruN a/include/ddraw.h b/include/ddraw.h 131 diff -ruN a/include/ddraw.h b/include/ddraw.h
133 --- a/include/ddraw.h 1970-01-01 01:00:00.000000000 +0100 132 --- a/include/ddraw.h 1970-01-01 01:00:00.000000000 +0100
134 +++ b/include/ddraw.h 2010-04-14 21:08:32.391043814 +0200 133 +++ b/include/ddraw.h 2010-04-25 13:03:46.911124579 +0200
135 @@ -0,0 +1,2681 @@ 134 @@ -0,0 +1,2681 @@
136 +/* 135 +/*
137 + * Copyright (C) the Wine project 136 + * Copyright (C) the Wine project
138 + * 137 + *
139 + * This library is free software; you can redistribute it and/or 138 + * This library is free software; you can redistribute it and/or
871 + DWORD dwYUVBitCount; /* C: how many bits per pixel */ 870 + DWORD dwYUVBitCount; /* C: how many bits per pixel */
872 + DWORD dwZBufferBitDepth; /* C: how many bits for z buffers */ 871 + DWORD dwZBufferBitDepth; /* C: how many bits for z buffers */
873 + DWORD dwAlphaBitDepth; /* C: how many bits for alpha channels*/ 872 + DWORD dwAlphaBitDepth; /* C: how many bits for alpha channels*/
874 + DWORD dwLuminanceBitCount; 873 + DWORD dwLuminanceBitCount;
875 + DWORD dwBumpBitCount; 874 + DWORD dwBumpBitCount;
876 + } u1; 875 + } DUMMYUNIONNAME1;
877 + union { 876 + union {
878 + DWORD dwRBitMask; /* 10: mask for red bit*/ 877 + DWORD dwRBitMask; /* 10: mask for red bit*/
879 + DWORD dwYBitMask; /* 10: mask for Y bits*/ 878 + DWORD dwYBitMask; /* 10: mask for Y bits*/
880 + DWORD dwStencilBitDepth; 879 + DWORD dwStencilBitDepth;
881 + DWORD dwLuminanceBitMask; 880 + DWORD dwLuminanceBitMask;
882 + DWORD dwBumpDuBitMask; 881 + DWORD dwBumpDuBitMask;
883 + } u2; 882 + } DUMMYUNIONNAME2;
884 + union { 883 + union {
885 + DWORD dwGBitMask; /* 14: mask for green bits*/ 884 + DWORD dwGBitMask; /* 14: mask for green bits*/
886 + DWORD dwUBitMask; /* 14: mask for U bits*/ 885 + DWORD dwUBitMask; /* 14: mask for U bits*/
887 + DWORD dwZBitMask; 886 + DWORD dwZBitMask;
888 + DWORD dwBumpDvBitMask; 887 + DWORD dwBumpDvBitMask;
889 + } u3; 888 + } DUMMYUNIONNAME3;
890 + union { 889 + union {
891 + DWORD dwBBitMask; /* 18: mask for blue bits*/ 890 + DWORD dwBBitMask; /* 18: mask for blue bits*/
892 + DWORD dwVBitMask; /* 18: mask for V bits*/ 891 + DWORD dwVBitMask; /* 18: mask for V bits*/
893 + DWORD dwStencilBitMask; 892 + DWORD dwStencilBitMask;
894 + DWORD dwBumpLuminanceBitMask; 893 + DWORD dwBumpLuminanceBitMask;
895 + } u4; 894 + } DUMMYUNIONNAME4;
896 + union { 895 + union {
897 + DWORD dwRGBAlphaBitMask; /* 1C: mask for alpha channel */ 896 + DWORD dwRGBAlphaBitMask; /* 1C: mask for alpha channel */
898 + DWORD dwYUVAlphaBitMask; /* 1C: mask for alpha channel */ 897 + DWORD dwYUVAlphaBitMask; /* 1C: mask for alpha channel */
899 + DWORD dwLuminanceAlphaBitMask; 898 + DWORD dwLuminanceAlphaBitMask;
900 + DWORD dwRGBZBitMask; /* 1C: mask for Z channel */ 899 + DWORD dwRGBZBitMask; /* 1C: mask for Z channel */
901 + DWORD dwYUVZBitMask; /* 1C: mask for Z channel */ 900 + DWORD dwYUVZBitMask; /* 1C: mask for Z channel */
902 + } u5; 901 + } DUMMYUNIONNAME5;
903 + /* 20: next structure */ 902 + /* 20: next structure */
904 +} DDPIXELFORMAT,*LPDDPIXELFORMAT; 903 +} DDPIXELFORMAT,*LPDDPIXELFORMAT;
905 + 904 +
906 +#ifndef __MINGW32__ 905 +#ifndef __MINGW32__
907 +#define MAKEFOURCC(ch0, ch1, ch2, ch3) \ 906 +#define MAKEFOURCC(ch0, ch1, ch2, ch3) \
1105 + DWORD dwHeight; /* 8: height of surface to be created*/ 1104 + DWORD dwHeight; /* 8: height of surface to be created*/
1106 + DWORD dwWidth; /* C: width of input surface*/ 1105 + DWORD dwWidth; /* C: width of input surface*/
1107 + union { 1106 + union {
1108 + LONG lPitch; /* 10: distance to start of next line (return value only)*/ 1107 + LONG lPitch; /* 10: distance to start of next line (return value only)*/
1109 + DWORD dwLinearSize; 1108 + DWORD dwLinearSize;
1110 + } u1; 1109 + } DUMMYUNIONNAME1;
1111 + DWORD dwBackBufferCount;/* 14: number of back buffers requested*/ 1110 + DWORD dwBackBufferCount;/* 14: number of back buffers requested*/
1112 + union { 1111 + union {
1113 + DWORD dwMipMapCount;/* 18:number of mip-map levels requested*/ 1112 + DWORD dwMipMapCount;/* 18:number of mip-map levels requested*/
1114 + DWORD dwZBufferBitDepth;/*18: depth of Z buffer requested*/ 1113 + DWORD dwZBufferBitDepth;/*18: depth of Z buffer requested*/
1115 + DWORD dwRefreshRate;/* 18:refresh rate (used when display mode is described)*/ 1114 + DWORD dwRefreshRate;/* 18:refresh rate (used when display mode is described)*/
1116 + } u2; 1115 + } DUMMYUNIONNAME2;
1117 + DWORD dwAlphaBitDepth;/* 1C:depth of alpha buffer requested*/ 1116 + DWORD dwAlphaBitDepth;/* 1C:depth of alpha buffer requested*/
1118 + DWORD dwReserved; /* 20:reserved*/ 1117 + DWORD dwReserved; /* 20:reserved*/
1119 + LPVOID lpSurface; /* 24:pointer to the associated surface memory*/ 1118 + LPVOID lpSurface; /* 24:pointer to the associated surface memory*/
1120 + DDCOLORKEY ddckCKDestOverlay;/* 28: CK for dest overlay use*/ 1119 + DDCOLORKEY ddckCKDestOverlay;/* 28: CK for dest overlay use*/
1121 + DDCOLORKEY ddckCKDestBlt; /* 30: CK for destination blt use*/ 1120 + DDCOLORKEY ddckCKDestBlt; /* 30: CK for destination blt use*/
1132 + DWORD dwHeight; /* 8: height of surface to be created*/ 1131 + DWORD dwHeight; /* 8: height of surface to be created*/
1133 + DWORD dwWidth; /* C: width of input surface*/ 1132 + DWORD dwWidth; /* C: width of input surface*/
1134 + union { 1133 + union {
1135 + LONG lPitch; /*10: distance to start of next line (return value only)*/ 1134 + LONG lPitch; /*10: distance to start of next line (return value only)*/
1136 + DWORD dwLinearSize; /*10: formless late-allocated optimized surface size */ 1135 + DWORD dwLinearSize; /*10: formless late-allocated optimized surface size */
1137 + } u1; 1136 + } DUMMYUNIONNAME1;
1138 + DWORD dwBackBufferCount;/* 14: number of back buffers requested*/ 1137 + DWORD dwBackBufferCount;/* 14: number of back buffers requested*/
1139 + union { 1138 + union {
1140 + DWORD dwMipMapCount;/* 18:number of mip-map levels requested*/ 1139 + DWORD dwMipMapCount;/* 18:number of mip-map levels requested*/
1141 + DWORD dwRefreshRate;/* 18:refresh rate (used when display mode is described)*/ 1140 + DWORD dwRefreshRate;/* 18:refresh rate (used when display mode is described)*/
1142 + DWORD dwSrcVBHandle;/* 18:source used in VB::Optimize */ 1141 + DWORD dwSrcVBHandle;/* 18:source used in VB::Optimize */
1143 + } u2; 1142 + } DUMMYUNIONNAME2;
1144 + DWORD dwAlphaBitDepth;/* 1C:depth of alpha buffer requested*/ 1143 + DWORD dwAlphaBitDepth;/* 1C:depth of alpha buffer requested*/
1145 + DWORD dwReserved; /* 20:reserved*/ 1144 + DWORD dwReserved; /* 20:reserved*/
1146 + LPVOID lpSurface; /* 24:pointer to the associated surface memory*/ 1145 + LPVOID lpSurface; /* 24:pointer to the associated surface memory*/
1147 + union { 1146 + union {
1148 + DDCOLORKEY ddckCKDestOverlay; /* 28: CK for dest overlay use*/ 1147 + DDCOLORKEY ddckCKDestOverlay; /* 28: CK for dest overlay use*/
1149 + DWORD dwEmptyFaceColor; /* 28: color for empty cubemap faces */ 1148 + DWORD dwEmptyFaceColor; /* 28: color for empty cubemap faces */
1150 + } u3; 1149 + } DUMMYUNIONNAME3;
1151 + DDCOLORKEY ddckCKDestBlt; /* 30: CK for destination blt use*/ 1150 + DDCOLORKEY ddckCKDestBlt; /* 30: CK for destination blt use*/
1152 + DDCOLORKEY ddckCKSrcOverlay;/* 38: CK for source overlay use*/ 1151 + DDCOLORKEY ddckCKSrcOverlay;/* 38: CK for source overlay use*/
1153 + DDCOLORKEY ddckCKSrcBlt; /* 40: CK for source blt use*/ 1152 + DDCOLORKEY ddckCKSrcBlt; /* 40: CK for source blt use*/
1154 + 1153 +
1155 + union { 1154 + union {
1156 + DDPIXELFORMAT ddpfPixelFormat;/* 48: pixel format description of the surface*/ 1155 + DDPIXELFORMAT ddpfPixelFormat;/* 48: pixel format description of the surface*/
1157 + DWORD dwFVF; /* 48: vertex format description of vertex buffers */ 1156 + DWORD dwFVF; /* 48: vertex format description of vertex buffers */
1158 + } u4; 1157 + } DUMMYUNIONNAME4;
1159 + DDSCAPS2 ddsCaps; /* 68: DDraw surface caps */ 1158 + DDSCAPS2 ddsCaps; /* 68: DDraw surface caps */
1160 + DWORD dwTextureStage; /* 78: stage in multitexture cascade */ 1159 + DWORD dwTextureStage; /* 78: stage in multitexture cascade */
1161 +} DDSURFACEDESC2,*LPDDSURFACEDESC2; 1160 +} DDSURFACEDESC2,*LPDDSURFACEDESC2;
1162 + 1161 +
1163 +/* DDCOLORCONTROL.dwFlags */ 1162 +/* DDCOLORCONTROL.dwFlags */
1237 + DWORD dwZDestConstBitDepth; /* Bit depth used to specify Z constant for destination */ 1236 + DWORD dwZDestConstBitDepth; /* Bit depth used to specify Z constant for destination */
1238 + union 1237 + union
1239 + { 1238 + {
1240 + DWORD dwZDestConst; /* Constant to use as Z buffer for dest */ 1239 + DWORD dwZDestConst; /* Constant to use as Z buffer for dest */
1241 + LPDIRECTDRAWSURFACE lpDDSZBufferDest; /* Surface to use as Z buffer for dest */ 1240 + LPDIRECTDRAWSURFACE lpDDSZBufferDest; /* Surface to use as Z buffer for dest */
1242 + } u1; 1241 + } DUMMYUNIONNAME1;
1243 + DWORD dwZSrcConstBitDepth; /* Bit depth used to specify Z constant for source */ 1242 + DWORD dwZSrcConstBitDepth; /* Bit depth used to specify Z constant for source */
1244 + union 1243 + union
1245 + { 1244 + {
1246 + DWORD dwZSrcConst; /* Constant to use as Z buffer for src */ 1245 + DWORD dwZSrcConst; /* Constant to use as Z buffer for src */
1247 + LPDIRECTDRAWSURFACE lpDDSZBufferSrc; /* Surface to use as Z buffer for src */ 1246 + LPDIRECTDRAWSURFACE lpDDSZBufferSrc; /* Surface to use as Z buffer for src */
1248 + } u2; 1247 + } DUMMYUNIONNAME2;
1249 + DWORD dwAlphaEdgeBlendBitDepth; /* Bit depth used to specify constant for alpha edge blend */ 1248 + DWORD dwAlphaEdgeBlendBitDepth; /* Bit depth used to specify constant for alpha edge blend */
1250 + DWORD dwAlphaEdgeBlend; /* Alpha for edge blending */ 1249 + DWORD dwAlphaEdgeBlend; /* Alpha for edge blending */
1251 + DWORD dwReserved; 1250 + DWORD dwReserved;
1252 + DWORD dwAlphaDestConstBitDepth; /* Bit depth used to specify alpha constant for destination */ 1251 + DWORD dwAlphaDestConstBitDepth; /* Bit depth used to specify alpha constant for destination */
1253 + union 1252 + union
1254 + { 1253 + {
1255 + DWORD dwAlphaDestConst; /* Constant to use as Alpha Channel */ 1254 + DWORD dwAlphaDestConst; /* Constant to use as Alpha Channel */
1256 + LPDIRECTDRAWSURFACE lpDDSAlphaDest; /* Surface to use as Alpha Channel */ 1255 + LPDIRECTDRAWSURFACE lpDDSAlphaDest; /* Surface to use as Alpha Channel */
1257 + } u3; 1256 + } DUMMYUNIONNAME3;
1258 + DWORD dwAlphaSrcConstBitDepth; /* Bit depth used to specify alpha constant for source */ 1257 + DWORD dwAlphaSrcConstBitDepth; /* Bit depth used to specify alpha constant for source */
1259 + union 1258 + union
1260 + { 1259 + {
1261 + DWORD dwAlphaSrcConst; /* Constant to use as Alpha Channel */ 1260 + DWORD dwAlphaSrcConst; /* Constant to use as Alpha Channel */
1262 + LPDIRECTDRAWSURFACE lpDDSAlphaSrc; /* Surface to use as Alpha Channel */ 1261 + LPDIRECTDRAWSURFACE lpDDSAlphaSrc; /* Surface to use as Alpha Channel */
1263 + } u4; 1262 + } DUMMYUNIONNAME4;
1264 + union 1263 + union
1265 + { 1264 + {
1266 + DWORD dwFillColor; /* color in RGB or Palettized */ 1265 + DWORD dwFillColor; /* color in RGB or Palettized */
1267 + DWORD dwFillDepth; /* depth value for z-buffer */ 1266 + DWORD dwFillDepth; /* depth value for z-buffer */
1268 + DWORD dwFillPixel; /* pixel val for RGBA or RGBZ */ 1267 + DWORD dwFillPixel; /* pixel val for RGBA or RGBZ */
1269 + LPDIRECTDRAWSURFACE lpDDSPattern; /* Surface to use as pattern */ 1268 + LPDIRECTDRAWSURFACE lpDDSPattern; /* Surface to use as pattern */
1270 + } u5; 1269 + } DUMMYUNIONNAME5;
1271 + DDCOLORKEY ddckDestColorkey; /* DestColorkey override */ 1270 + DDCOLORKEY ddckDestColorkey; /* DestColorkey override */
1272 + DDCOLORKEY ddckSrcColorkey; /* SrcColorkey override */ 1271 + DDCOLORKEY ddckSrcColorkey; /* SrcColorkey override */
1273 +} DDBLTFX,*LPDDBLTFX; 1272 +} DDBLTFX,*LPDDBLTFX;
1274 + 1273 +
1275 +/* dwDDFX */ 1274 +/* dwDDFX */
1301 + DWORD dwAlphaDestConstBitDepth; /* Bit depth used to specify alpha constant for destination */ 1300 + DWORD dwAlphaDestConstBitDepth; /* Bit depth used to specify alpha constant for destination */
1302 + union 1301 + union
1303 + { 1302 + {
1304 + DWORD dwAlphaDestConst; /* Constant to use as alpha channel for dest */ 1303 + DWORD dwAlphaDestConst; /* Constant to use as alpha channel for dest */
1305 + LPDIRECTDRAWSURFACE lpDDSAlphaDest; /* Surface to use as alpha channel for dest */ 1304 + LPDIRECTDRAWSURFACE lpDDSAlphaDest; /* Surface to use as alpha channel for dest */
1306 + } u1; 1305 + } DUMMYUNIONNAME1;
1307 + DWORD dwAlphaSrcConstBitDepth; /* Bit depth used to specify alpha constant for source */ 1306 + DWORD dwAlphaSrcConstBitDepth; /* Bit depth used to specify alpha constant for source */
1308 + union 1307 + union
1309 + { 1308 + {
1310 + DWORD dwAlphaSrcConst; /* Constant to use as alpha channel for src */ 1309 + DWORD dwAlphaSrcConst; /* Constant to use as alpha channel for src */
1311 + LPDIRECTDRAWSURFACE lpDDSAlphaSrc; /* Surface to use as alpha channel for src */ 1310 + LPDIRECTDRAWSURFACE lpDDSAlphaSrc; /* Surface to use as alpha channel for src */
1312 + } u2; 1311 + } DUMMYUNIONNAME2;
1313 + DDCOLORKEY dckDestColorkey; /* DestColorkey override */ 1312 + DDCOLORKEY dckDestColorkey; /* DestColorkey override */
1314 + DDCOLORKEY dckSrcColorkey; /* DestColorkey override */ 1313 + DDCOLORKEY dckSrcColorkey; /* DestColorkey override */
1315 + DWORD dwDDFX; /* Overlay FX */ 1314 + DWORD dwDDFX; /* Overlay FX */
1316 + DWORD dwFlags; /* flags */ 1315 + DWORD dwFlags; /* flags */
1317 +} DDOVERLAYFX,*LPDDOVERLAYFX; 1316 +} DDOVERLAYFX,*LPDDOVERLAYFX;
2892 + 2891 +
2893 +#endif //_DMO_H 2892 +#endif //_DMO_H
2894 \ No newline at end of file 2893 \ No newline at end of file
2895 diff -ruN a/include/dshow.h b/include/dshow.h 2894 diff -ruN a/include/dshow.h b/include/dshow.h
2896 --- a/include/dshow.h 2008-12-06 03:31:56.000000000 +0100 2895 --- a/include/dshow.h 2008-12-06 03:31:56.000000000 +0100
2897 +++ b/include/dshow.h 2010-04-14 21:08:32.363036508 +0200 2896 +++ b/include/dshow.h 2010-04-25 13:03:46.887145541 +0200
2898 @@ -5,7 +5,10 @@ 2897 @@ -5,7 +5,10 @@
2899 #endif 2898 #endif
2900 2899
2901 #include <strmif.h> 2900 #include <strmif.h>
2902 +#ifdef DSHOW_USE_AMAUDIO 2901 +#ifdef DSHOW_USE_AMAUDIO
3074 + 3073 +
3075 +#endif //_QNETWORK_H 3074 +#endif //_QNETWORK_H
3076 \ No newline at end of file 3075 \ No newline at end of file
3077 diff -ruN a/include/strmif.h b/include/strmif.h 3076 diff -ruN a/include/strmif.h b/include/strmif.h
3078 --- a/include/strmif.h 2008-12-06 03:32:10.000000000 +0100 3077 --- a/include/strmif.h 2008-12-06 03:32:10.000000000 +0100
3079 +++ b/include/strmif.h 2010-04-14 21:08:32.363036508 +0200 3078 +++ b/include/strmif.h 2010-04-25 13:03:46.887145541 +0200
3080 @@ -4,10 +4,79 @@ 3079 @@ -4,10 +4,79 @@
3081 #pragma GCC system_header 3080 #pragma GCC system_header
3082 #endif 3081 #endif
3083 3082
3084 +#include <ddraw.h> 3083 +#include <ddraw.h>
3532 #ifdef __cplusplus 3531 #ifdef __cplusplus
3533 } 3532 }
3534 #endif 3533 #endif
3535 diff -ruN a/include/vmr9.h b/include/vmr9.h 3534 diff -ruN a/include/vmr9.h b/include/vmr9.h
3536 --- a/include/vmr9.h 2008-12-06 03:32:11.000000000 +0100 3535 --- a/include/vmr9.h 2008-12-06 03:32:11.000000000 +0100
3537 +++ b/include/vmr9.h 2010-04-14 21:08:32.363036508 +0200 3536 +++ b/include/vmr9.h 2010-04-25 13:03:46.891124634 +0200
3538 @@ -8,6 +8,10 @@ 3537 @@ -8,6 +8,10 @@
3539 extern "C" { 3538 extern "C" {
3540 #endif 3539 #endif
3541 3540
3542 +EXTERN_C const IID IID_IVMRFilterConfig9; 3541 +EXTERN_C const IID IID_IVMRFilterConfig9;