Commit c4bca84b authored by Vadim Pisarevsky's avatar Vadim Pisarevsky

possibly fixed problem with compiling library with MinGW 4.4.1

parent 3fa4c8f0
#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
...@@ -87,6 +87,8 @@ Thanks to: ...@@ -87,6 +87,8 @@ Thanks to:
*/ */
///////////////////////////////////////////////////////// /////////////////////////////////////////////////////////
#include "precomp.hpp"
#if _MSC_VER >= 1400 #if _MSC_VER >= 1400
#pragma warning(disable: 4995) #pragma warning(disable: 4995)
#endif #endif
...@@ -100,7 +102,6 @@ Thanks to: ...@@ -100,7 +102,6 @@ Thanks to:
#include <vector> #include <vector>
//Include Directshow stuff here so we don't worry about needing all the h files. //Include Directshow stuff here so we don't worry about needing all the h files.
#ifdef _MSC_VER #ifdef _MSC_VER
#include "DShow.h" #include "DShow.h"
...@@ -111,7 +112,7 @@ Thanks to: ...@@ -111,7 +112,7 @@ Thanks to:
#else #else
#include "dshow/dshow.h" #include "dshow/dshow.h"
#include "dshow/dvdmedia.h" #include "dshow/dvdmedia.h"
#include "bdatypes.h" #include "dshow/bdatypes.h"
interface IEnumPIDMap : public IUnknown interface IEnumPIDMap : public IUnknown
{ {
...@@ -155,8 +156,6 @@ interface IMPEG2PIDMap : public IUnknown ...@@ -155,8 +156,6 @@ interface IMPEG2PIDMap : public IUnknown
#define _WIN32_WINNT 0x400 #define _WIN32_WINNT 0x400
#endif #endif
#include <windows.h>
/* /*
MEDIASUBTYPE_I420 : TGUID ='{30323449-0000-0010-8000-00AA00389B71}'; MEDIASUBTYPE_I420 : TGUID ='{30323449-0000-0010-8000-00AA00389B71}';
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment