Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
O
opencv
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
opencv
Commits
c4bca84b
Commit
c4bca84b
authored
Jun 22, 2011
by
Vadim Pisarevsky
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
possibly fixed problem with compiling library with MinGW 4.4.1
parent
3fa4c8f0
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
35 additions
and
4 deletions
+35
-4
bdatypes.h
3rdparty/include/dshow/bdatypes.h
+32
-0
cap_dshow.cpp
modules/highgui/src/cap_dshow.cpp
+3
-4
No files found.
3rdparty/include/dshow/bdatypes.h
0 → 100755
View file @
c4bca84b
#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
modules/highgui/src/cap_dshow.cpp
View file @
c4bca84b
...
...
@@ -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}';
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment