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/directshowglobal.h | |
| 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/directshowglobal.h')
| -rw-r--r-- | src/plugins/directshow/common/directshowglobal.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/directshow/common/directshowglobal.h b/src/plugins/directshow/common/directshowglobal.h index 5f391710e..d98dd36ee 100644 --- a/src/plugins/directshow/common/directshowglobal.h +++ b/src/plugins/directshow/common/directshowglobal.h @@ -64,7 +64,7 @@ template <typename T> T *com_new(const IID &clsid) T *object = 0; return CoCreateInstance( clsid, - NULL, + nullptr, CLSCTX_INPROC_SERVER, IID_PPV_ARGS(&object)) == S_OK ? object @@ -76,7 +76,7 @@ template <typename T> T *com_new(const IID &clsid, const IID &iid) T *object = 0; return CoCreateInstance( clsid, - NULL, + nullptr, CLSCTX_INPROC_SERVER, iid, reinterpret_cast<void **>(&object)) == S_OK |