diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2017-07-19 02:19:47 +0530 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek@centricular.com> | 2017-07-19 02:27:29 +0530 |
| commit | 0084bfccc9d7d3ef3980bf942ce24bc83648b62a (patch) | |
| tree | 737d8db01d0da808de73d86696091931f04a49bc /sys/decklink/gstdecklinkaudiosink.cpp | |
| parent | 93c379a3fcfb3891ebe480177179f3e71267a971 (diff) | |
| download | gstreamer-plugins-bad-0084bfccc9d7d3ef3980bf942ce24bc83648b62a.tar.gz | |
decklink: Fix build on mingw32 by adding missing WINAPI
gstdecklinkaudiosink.cpp:155:19: error: conflicting type attributes specified for 'virtual HRESULT GStreamerAudioOutputCallback::QueryInterface(const IID&, void**)'
In file included from /var/lib/jenkins/workspace/cerbero-cross-mingw32/workdir/mingw/w32/bin/../lib/gcc/i686-w64-mingw32/4.7.3/../../../../i686-w64-mingw32/include/objbase.h:153:0,
from /var/lib/jenkins/workspace/cerbero-cross-mingw32/workdir/mingw/w32/bin/../lib/gcc/i686-w64-mingw32/4.7.3/../../../../i686-w64-mingw32/include/ole2.h:16,
from /var/lib/jenkins/workspace/cerbero-cross-mingw32/workdir/mingw/w32/bin/../lib/gcc/i686-w64-mingw32/4.7.3/../../../../i686-w64-mingw32/include/windows.h:94,
from /var/lib/jenkins/workspace/cerbero-cross-mingw32/workdir/mingw/w32/bin/../lib/gcc/i686-w64-mingw32/4.7.3/../../../../i686-w64-mingw32/include/rpc.h:16,
from win/DeckLinkAPI.h:27,
from gstdecklink.h:35,
from gstdecklinkaudiosink.h:27,
from gstdecklinkaudiosink.cpp:25:
/var/lib/jenkins/workspace/cerbero-cross-mingw32/workdir/mingw/w32/bin/../lib/gcc/i686-w64-mingw32/4.7.3/../../../../i686-w64-mingw32/include/unknwn.h:67:25: error: overriding 'virtual HRESULT IUnknown::QueryInterface(const IID&, void**)'
(and many more)
https://ci.gstreamer.net/job/cerbero-cross-mingw32/6407/console
Diffstat (limited to 'sys/decklink/gstdecklinkaudiosink.cpp')
| -rw-r--r-- | sys/decklink/gstdecklinkaudiosink.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/decklink/gstdecklinkaudiosink.cpp b/sys/decklink/gstdecklinkaudiosink.cpp index 1d631548f..beabc0250 100644 --- a/sys/decklink/gstdecklinkaudiosink.cpp +++ b/sys/decklink/gstdecklinkaudiosink.cpp @@ -152,12 +152,12 @@ public: g_mutex_init (&m_mutex); } - virtual HRESULT QueryInterface (REFIID, LPVOID *) + virtual HRESULT WINAPI QueryInterface (REFIID, LPVOID *) { return E_NOINTERFACE; } - virtual ULONG AddRef (void) + virtual ULONG WINAPI AddRef (void) { ULONG ret; @@ -169,7 +169,7 @@ public: return ret; } - virtual ULONG Release (void) + virtual ULONG WINAPI Release (void) { ULONG ret; @@ -190,7 +190,7 @@ public: g_mutex_clear (&m_mutex); } - virtual HRESULT RenderAudioSamples (bool preroll) + virtual HRESULT WINAPI RenderAudioSamples (bool preroll) { guint8 *ptr; gint seg; |