diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-04-14 03:00:58 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-04-14 03:00:58 +0200 |
| commit | 457181d73c5bc188cfea13e13dbe930de3b993d3 (patch) | |
| tree | 284ad58d191f7defd07c55393c426499c9970f6f /src/plugins/directshow/camera | |
| parent | d5a1385c7df4714df571d7f80916708b47767a57 (diff) | |
| parent | 7bd13d3f98a6f1f9cf7aed122fd2f301fbae9d62 (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: I9687c59d15cd816969f362d72b19f279a1a2d04e
Diffstat (limited to 'src/plugins/directshow/camera')
| -rw-r--r-- | src/plugins/directshow/camera/dscamerasession.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/plugins/directshow/camera/dscamerasession.cpp b/src/plugins/directshow/camera/dscamerasession.cpp index cee3e9c56..7703aa498 100644 --- a/src/plugins/directshow/camera/dscamerasession.cpp +++ b/src/plugins/directshow/camera/dscamerasession.cpp @@ -1146,9 +1146,14 @@ void DSCameraSession::updateSourceCapabilities() m_supportedViewfinderSettings.append(settings); m_supportedFormats.append(DirectShowMediaType(*pmt)); } - - + } else { + OLECHAR *guidString = nullptr; + StringFromCLSID(pmt->subtype, &guidString); + if (guidString) + qWarning() << "Unsupported media type:" << QString::fromWCharArray(guidString); + ::CoTaskMemFree(guidString); } + DirectShowMediaType::deleteType(pmt); } } |