diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-01-08 01:17:56 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-01-08 01:17:56 +0200 |
| commit | d157b2a8ce6c4a708b91dc5e2d52b2d672e8c2ec (patch) | |
| tree | bfcdec92ef691c472bb71a896ccb5ee1d7e29129 /stream | |
| parent | dd0bab9239fb1be1df856205d6a5c085910e0ae8 (diff) | |
| parent | 1d3fd9e1ea720c23076268cb69fa2c4245dd9109 (diff) | |
| download | mpv-d157b2a8ce6c4a708b91dc5e2d52b2d672e8c2ec.tar.bz2 mpv-d157b2a8ce6c4a708b91dc5e2d52b2d672e8c2ec.tar.xz | |
Merge svn changes up to r30173
Diffstat (limited to 'stream')
| -rw-r--r-- | stream/tvi_dshow.c | 5 | ||||
| -rw-r--r-- | stream/tvi_dshow.h | 16 |
2 files changed, 21 insertions, 0 deletions
diff --git a/stream/tvi_dshow.c b/stream/tvi_dshow.c index 09c6328d8d..50830da848 100644 --- a/stream/tvi_dshow.c +++ b/stream/tvi_dshow.c @@ -89,6 +89,11 @@ #include "tvi_dshow.h" +#ifndef STDCALL +// mingw64 needs this +#define STDCALL __stdcall +#endif + static tvi_handle_t *tvi_init_dshow(tv_param_t* tv_param); /* diff --git a/stream/tvi_dshow.h b/stream/tvi_dshow.h index dc5a7c3741..3dea9d348a 100644 --- a/stream/tvi_dshow.h +++ b/stream/tvi_dshow.h @@ -434,6 +434,8 @@ DECLARE_INTERFACE(IAMCrossbar) STDMETHOD(get_CrossbarPinInfo) (THIS_ BOOL, long, long *, long *); }; +#ifndef __IPropertyBag_INTERFACE_DEFINED__ +#define __IPropertyBag_INTERFACE_DEFINED__ #undef INTERFACE #define INTERFACE IPropertyBag DECLARE_INTERFACE(IPropertyBag) @@ -444,6 +446,7 @@ DECLARE_INTERFACE(IPropertyBag) STDMETHOD(Read) (THIS_ LPCOLESTR, LPVARIANT, LPERRORLOG); STDMETHOD(Write) (THIS_ LPCOLESTR, LPVARIANT); }; +#endif #undef INTERFACE #define INTERFACE IAMStreamConfig @@ -678,6 +681,19 @@ DECLARE_INTERFACE(IVideoWindow) STDMETHOD(IsCursorHidden) (THIS_ long *); }; +#ifndef DECLARE_ENUMERATOR_ +#define DECLARE_ENUMERATOR_(I,T) \ + DECLARE_INTERFACE_(I,IUnknown) \ + { \ + STDMETHOD(QueryInterface)(I*, REFIID,PVOID*); \ + STDMETHOD_(ULONG,AddRef)(I*); \ + STDMETHOD_(ULONG,Release)(I*); \ + STDMETHOD(Next)(I*, ULONG,T*,ULONG*); \ + STDMETHOD(Skip)(I*, ULONG); \ + STDMETHOD(Reset)(I*); \ + STDMETHOD(Clone)(I*, I**); \ + } +#endif DECLARE_ENUMERATOR_(IEnumFilters, LPBASEFILTER); DECLARE_ENUMERATOR_(IEnumPins, LPPIN); DECLARE_ENUMERATOR_(IEnumMediaTypes, AM_MEDIA_TYPE *); |