diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-07-23 11:05:11 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-07-23 11:05:11 +0200 |
| commit | 32e49d634c5892ed98074cb3dd76a323357dfe54 (patch) | |
| tree | 252495f053b0084da47894ce1daee460abe40718 /src/plugins/directshow/common/directshowbasefilter.cpp | |
| parent | 5825dd2773755cea236d9816cc7541bc20f9cb80 (diff) | |
| parent | d9dd7f4896cbc0fe1dc37e517c28315419e6ffcd (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
src/plugins/directshow/player/directshowplayerservice.cpp
Change-Id: I482098bb3c3b5b291175ca798b0d6ba61ad87d86
Diffstat (limited to 'src/plugins/directshow/common/directshowbasefilter.cpp')
| -rw-r--r-- | src/plugins/directshow/common/directshowbasefilter.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/plugins/directshow/common/directshowbasefilter.cpp b/src/plugins/directshow/common/directshowbasefilter.cpp index 2792dc3c6..d64021ed6 100644 --- a/src/plugins/directshow/common/directshowbasefilter.cpp +++ b/src/plugins/directshow/common/directshowbasefilter.cpp @@ -46,9 +46,9 @@ QT_BEGIN_NAMESPACE DirectShowBaseFilter::DirectShowBaseFilter() : m_mutex(QMutex::Recursive) , m_state(State_Stopped) - , m_graph(NULL) - , m_clock(NULL) - , m_sink(NULL) + , m_graph(nullptr) + , m_clock(nullptr) + , m_sink(nullptr) { } @@ -57,7 +57,7 @@ DirectShowBaseFilter::~DirectShowBaseFilter() { if (m_clock) { m_clock->Release(); - m_clock = NULL; + m_clock = nullptr; } } @@ -217,7 +217,7 @@ HRESULT DirectShowBaseFilter::JoinFilterGraph(IFilterGraph *pGraph, LPCWSTR pNam m_filterName = QString::fromWCharArray(pName); m_graph = pGraph; - m_sink = NULL; + m_sink = nullptr; if (m_graph) { if (SUCCEEDED(m_graph->QueryInterface(IID_PPV_ARGS(&m_sink)))) |