diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-04-28 03:01:23 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-04-28 03:01:23 +0200 |
| commit | 46518fa76c83de9a3a9edc870539a9e8b7eaef9f (patch) | |
| tree | af26a6a84537b63620b50f1f6315b3178e31b946 /src/plugins/directshow/common/directshowpin.cpp | |
| parent | 15551b768402e9785cc1441a51851ece48a186be (diff) | |
| parent | 8aaf91f29933bf652ef6dc0215dea1f278b1f858 (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: Ia54c943ca0022bd8e1182fc4f156a717cffbef41
Diffstat (limited to 'src/plugins/directshow/common/directshowpin.cpp')
| -rw-r--r-- | src/plugins/directshow/common/directshowpin.cpp | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/src/plugins/directshow/common/directshowpin.cpp b/src/plugins/directshow/common/directshowpin.cpp index b49c3f8a4..65b54b8e9 100644 --- a/src/plugins/directshow/common/directshowpin.cpp +++ b/src/plugins/directshow/common/directshowpin.cpp @@ -61,16 +61,6 @@ DirectShowPin::~DirectShowPin() } -HRESULT DirectShowPin::getInterface(const IID &riid, void **ppvObject) -{ - if (riid == IID_IPin) - return GetInterface(static_cast<IPin*>(this), ppvObject); - else - return DirectShowObject::getInterface(riid, ppvObject); -} - - - HRESULT DirectShowPin::Connect(IPin *pReceivePin, const AM_MEDIA_TYPE *pmt) { if (!pReceivePin) @@ -526,14 +516,6 @@ DirectShowInputPin::~DirectShowInputPin() } -HRESULT DirectShowInputPin::getInterface(const IID &riid, void **ppvObject) -{ - if (riid == IID_IMemInputPin) - return GetInterface(static_cast<IMemInputPin*>(this), ppvObject); - else - return DirectShowPin::getInterface(riid, ppvObject); -} - HRESULT DirectShowInputPin::connectionEnded() { if (m_allocator) { |