diff options
| author | VaL Doroshchuk <valentyn.doroshchuk@qt.io> | 2019-07-23 10:33:51 +0200 |
|---|---|---|
| committer | VaL Doroshchuk <valentyn.doroshchuk@qt.io> | 2019-07-23 10:33:51 +0200 |
| commit | 14d6166b2790b37906fd76248d955659ff78622f (patch) | |
| tree | f02ec37165b5ae47beb238aa23031e6e2106502f /src/plugins/directshow/common/directshowvideobuffer.cpp | |
| parent | e99a2e1701179d0d28ef1d1eac696d480894f4bb (diff) | |
| parent | 2eb0a98f1de07782004a5a4261cb5d2c46ca6d15 (diff) | |
Merge branch 'dev' of git://code.qt.io/qt/qtmultimedia into wip/qt6
Change-Id: I91e8d902cd916ee16a2495da9bf40a34c6bc05d2
Diffstat (limited to 'src/plugins/directshow/common/directshowvideobuffer.cpp')
| -rw-r--r-- | src/plugins/directshow/common/directshowvideobuffer.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/directshow/common/directshowvideobuffer.cpp b/src/plugins/directshow/common/directshowvideobuffer.cpp index 7f94da97e..fc329f58a 100644 --- a/src/plugins/directshow/common/directshowvideobuffer.cpp +++ b/src/plugins/directshow/common/directshowvideobuffer.cpp @@ -64,7 +64,7 @@ uchar *DirectShowVideoBuffer::map(MapMode mode, int *numBytes, int *bytesPerLine if (bytesPerLine) *bytesPerLine = m_bytesPerLine; - BYTE *bytes = 0; + BYTE *bytes = nullptr; if (m_sample->GetPointer(&bytes) == S_OK) { m_mapMode = mode; @@ -72,7 +72,7 @@ uchar *DirectShowVideoBuffer::map(MapMode mode, int *numBytes, int *bytesPerLine return reinterpret_cast<uchar *>(bytes); } } - return 0; + return nullptr; } void DirectShowVideoBuffer::unmap() |