diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-01-06 20:21:19 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-01-06 20:21:19 +0100 |
| commit | 82621148de82d63a562163a72598e15ed98797a8 (patch) | |
| tree | 030d345ad4a4ae612995949bbbeec66b36e69854 /src/plugins/directshow/camera/dscamerasession.cpp | |
| parent | 2fc515ea1eaa0f7ffb56c4dadee560095c3374bd (diff) | |
| parent | 7a3b8907060123fe5d487d4c9ba3a1e222f468bb (diff) | |
Merge remote-tracking branch 'origin/5.10' into dev
Conflicts:
.qmake.conf
Change-Id: I5acdc7e0bd3729b80522dfff0f388cf2507fb111
Diffstat (limited to 'src/plugins/directshow/camera/dscamerasession.cpp')
| -rw-r--r-- | src/plugins/directshow/camera/dscamerasession.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/directshow/camera/dscamerasession.cpp b/src/plugins/directshow/camera/dscamerasession.cpp index 195712057..6590afeb9 100644 --- a/src/plugins/directshow/camera/dscamerasession.cpp +++ b/src/plugins/directshow/camera/dscamerasession.cpp @@ -815,8 +815,8 @@ bool DSCameraSession::configurePreviewFormat() return false; } - // Set sample grabber format (always RGB32) - static const AM_MEDIA_TYPE grabberFormat { MEDIATYPE_Video, MEDIASUBTYPE_RGB32, 0, 0, 0, FORMAT_VideoInfo, nullptr, 0, nullptr}; + // Set sample grabber format + static const AM_MEDIA_TYPE grabberFormat { MEDIATYPE_Video, MEDIASUBTYPE_ARGB32, 0, 0, 0, FORMAT_VideoInfo, nullptr, 0, nullptr}; if (!m_previewSampleGrabber->setMediaType(&grabberFormat)) return false; |