From c4bca84bc971384b3947630ac6c560344366e597 Mon Sep 17 00:00:00 2001
From: Vadim Pisarevsky <no@email>
Date: Wed, 22 Jun 2011 08:24:27 +0000
Subject: [PATCH] possibly fixed problem with compiling library with MinGW
 4.4.1

---
 3rdparty/include/dshow/bdatypes.h | 32 +++++++++++++++++++++++++++++++
 modules/highgui/src/cap_dshow.cpp |  7 +++----
 2 files changed, 35 insertions(+), 4 deletions(-)
 create mode 100755 3rdparty/include/dshow/bdatypes.h

diff --git a/3rdparty/include/dshow/bdatypes.h b/3rdparty/include/dshow/bdatypes.h
new file mode 100755
index 0000000000..d42dceb2e1
--- /dev/null
+++ b/3rdparty/include/dshow/bdatypes.h
@@ -0,0 +1,32 @@
+#ifndef _BDATYPES_H
+#define _BDATYPES_H
+#if __GNUC__ >= 3
+#pragma GCC system_header
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*--- DirectShow Reference - DirectShow Enumerated Types */
+typedef enum {
+	MEDIA_TRANSPORT_PACKET,
+	MEDIA_ELEMENTARY_STREAM,
+	MEDIA_MPEG2_PSI,
+	MEDIA_TRANSPORT_PAYLOAD
+} MEDIA_SAMPLE_CONTENT;
+/*--- DirectShow Reference - DirectShow Structures */
+typedef struct {
+	DWORD dwOffset;
+	DWORD dwPacketLength;
+	DWORD dwStride;
+} MPEG2_TRANSPORT_STRIDE;
+typedef struct {
+	ULONG ulPID;
+	MEDIA_SAMPLE_CONTENT MediaSampleContent ;
+} PID_MAP;
+
+#ifdef __cplusplus
+}
+#endif
+#endif
diff --git a/modules/highgui/src/cap_dshow.cpp b/modules/highgui/src/cap_dshow.cpp
index 935473d262..db1935a438 100644
--- a/modules/highgui/src/cap_dshow.cpp
+++ b/modules/highgui/src/cap_dshow.cpp
@@ -87,6 +87,8 @@ Thanks to:
 */
 /////////////////////////////////////////////////////////
 
+#include "precomp.hpp"
+
 #if _MSC_VER >= 1400
 #pragma warning(disable: 4995)
 #endif
@@ -100,7 +102,6 @@ Thanks to:
 
 #include <vector>
 
-
 //Include Directshow stuff here so we don't worry about needing all the h files.
 #ifdef _MSC_VER
 #include "DShow.h"
@@ -111,7 +112,7 @@ Thanks to:
 #else
 #include "dshow/dshow.h"
 #include "dshow/dvdmedia.h"
-#include "bdatypes.h"
+#include "dshow/bdatypes.h"
 
 interface IEnumPIDMap : public IUnknown
 {
@@ -155,8 +156,6 @@ interface IMPEG2PIDMap : public IUnknown
 #define _WIN32_WINNT 0x400
 #endif
 
-#include <windows.h>
-
 
 /*
 MEDIASUBTYPE_I420 : TGUID ='{30323449-0000-0010-8000-00AA00389B71}';