diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-02-19 10:04:30 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-02-19 10:05:11 +0100 |
| commit | 13882cd5da72bf0f6657752344793103a43a8e41 (patch) | |
| tree | 6a3323763df5e42fc5d25a84786efff1f41c256e /src/plugins/directshow/player/directshowglobal.h | |
| parent | 391e8a7147edb1cdff6f1362ae0d3be4e7271ea7 (diff) | |
| parent | 01714ef0c5ee80544e3799ae2a66d9a611c9d71f (diff) | |
| download | qtmultimedia-13882cd5da72bf0f6657752344793103a43a8e41.tar.gz | |
Merge remote-tracking branch 'origin/dev' into stable
Change-Id: I84b36fa41f3d5f8fea2dec2545f72ebe6a0c7908
Diffstat (limited to 'src/plugins/directshow/player/directshowglobal.h')
| -rw-r--r-- | src/plugins/directshow/player/directshowglobal.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/plugins/directshow/player/directshowglobal.h b/src/plugins/directshow/player/directshowglobal.h index b604a8d0e..f2a7fef03 100644 --- a/src/plugins/directshow/player/directshowglobal.h +++ b/src/plugins/directshow/player/directshowglobal.h @@ -76,7 +76,7 @@ DECLARE_INTERFACE_(IFilterGraph2 ,IGraphBuilder) STDMETHOD(ReconnectEx)(THIS_ IPin *, const AM_MEDIA_TYPE *) PURE; STDMETHOD(RenderEx)(IPin *, DWORD, DWORD *) PURE; }; -#undef INTERFACE +#undef INTERFACE #endif #ifndef __IAMFilterMiscFlags_INTERFACE_DEFINED__ @@ -89,7 +89,7 @@ DECLARE_INTERFACE_(IAMFilterMiscFlags ,IUnknown) STDMETHOD_(ULONG,Release)(THIS) PURE; STDMETHOD_(ULONG,GetMiscFlags)(THIS) PURE; }; -#undef INTERFACE +#undef INTERFACE #endif #ifndef __IFileSourceFilter_INTERFACE_DEFINED__ @@ -103,7 +103,7 @@ DECLARE_INTERFACE_(IFileSourceFilter ,IUnknown) STDMETHOD(Load)(THIS_ LPCOLESTR, const AM_MEDIA_TYPE *) PURE; STDMETHOD(GetCurFile)(THIS_ LPOLESTR *ppszFileName, AM_MEDIA_TYPE *) PURE; }; -#undef INTERFACE +#undef INTERFACE #endif #ifndef __IAMOpenProgress_INTERFACE_DEFINED__ @@ -117,7 +117,7 @@ DECLARE_INTERFACE_(IAMOpenProgress ,IUnknown) STDMETHOD(QueryProgress)(THIS_ LONGLONG *, LONGLONG *) PURE; STDMETHOD(AbortOperation)(THIS) PURE; }; -#undef INTERFACE +#undef INTERFACE #endif #ifndef __IFilterChain_INTERFACE_DEFINED__ @@ -133,7 +133,7 @@ DECLARE_INTERFACE_(IFilterChain ,IUnknown) STDMETHOD(StopChain)(IBaseFilter *, IBaseFilter *) PURE; STDMETHOD(RemoveChain)(IBaseFilter *, IBaseFilter *) PURE; }; -#undef INTERFACE +#undef INTERFACE #endif #endif |