diff options
author | Rolf Eike Beer <eb@emlix.com> | 2019-07-16 08:38:30 +0200 |
---|---|---|
committer | Rolf Eike Beer <eb@emlix.com> | 2019-07-16 11:01:12 +0200 |
commit | 28bd5f54f5230f5a5002db28f2d3fec7cadc1540 (patch) | |
tree | 362ed866102dd47180544fe7c7fbd5ca380b6120 /src/plugins/directshow/player | |
parent | 7d2040234d04568aa4658f4a39828c9305bc6571 (diff) |
DirectShow plugin: use nullptr instead of NULL
Change-Id: Ied89175c4b7f5df090deac174b1da1e8496ee533
Reviewed-by: VaL Doroshchuk <valentyn.doroshchuk@qt.io>
Diffstat (limited to 'src/plugins/directshow/player')
-rw-r--r-- | src/plugins/directshow/player/directshowevrvideowindowcontrol.cpp | 4 | ||||
-rw-r--r-- | src/plugins/directshow/player/videosurfacefilter.cpp | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/plugins/directshow/player/directshowevrvideowindowcontrol.cpp b/src/plugins/directshow/player/directshowevrvideowindowcontrol.cpp index fc1058d57..57d88326c 100644 --- a/src/plugins/directshow/player/directshowevrvideowindowcontrol.cpp +++ b/src/plugins/directshow/player/directshowevrvideowindowcontrol.cpp @@ -43,7 +43,7 @@ DirectShowEvrVideoWindowControl::DirectShowEvrVideoWindowControl(QObject *parent) : EvrVideoWindowControl(parent) - , m_evrFilter(NULL) + , m_evrFilter(nullptr) { } @@ -59,7 +59,7 @@ IBaseFilter *DirectShowEvrVideoWindowControl::filter() m_evrFilter = com_new<IBaseFilter>(clsid_EnhancedVideoRenderer); if (!setEvr(m_evrFilter)) { m_evrFilter->Release(); - m_evrFilter = NULL; + m_evrFilter = nullptr; } } diff --git a/src/plugins/directshow/player/videosurfacefilter.cpp b/src/plugins/directshow/player/videosurfacefilter.cpp index 826d26bdb..62994636c 100644 --- a/src/plugins/directshow/player/videosurfacefilter.cpp +++ b/src/plugins/directshow/player/videosurfacefilter.cpp @@ -222,16 +222,16 @@ HRESULT VideoSurfaceInputPin::Receive(IMediaSample *pMediaSample) VideoSurfaceFilter::VideoSurfaceFilter(QAbstractVideoSurface *surface, DirectShowEventLoop *loop, QObject *parent) : QObject(parent) , m_loop(loop) - , m_pin(NULL) + , m_pin(nullptr) , m_surface(surface) , m_bytesPerLine(0) , m_surfaceStarted(false) , m_renderMutex(QMutex::Recursive) , m_running(false) - , m_pendingSample(NULL) + , m_pendingSample(nullptr) , m_pendingSampleEndTime(0) - , m_renderEvent(CreateEvent(NULL, FALSE, FALSE, NULL)) - , m_flushEvent(CreateEvent(NULL, TRUE, FALSE, NULL)) + , m_renderEvent(CreateEvent(nullptr, FALSE, FALSE, nullptr)) + , m_flushEvent(CreateEvent(nullptr, TRUE, FALSE, nullptr)) , m_adviseCookie(0) , m_EOS(false) , m_EOSDelivered(false) @@ -615,7 +615,7 @@ void VideoSurfaceFilter::clearPendingSample() if (m_pendingSample) { qCDebug(qLcRenderFilter, "clearPendingSample"); m_pendingSample->Release(); - m_pendingSample = NULL; + m_pendingSample = nullptr; } } |