From c3a24f7091b506cdb54d6ec020d57853c6d70ae8 Mon Sep 17 00:00:00 2001
From: Edric Milaret <edric.ladent-milaret@savoirfairelinux.com>
Date: Wed, 6 May 2015 10:48:22 -0400
Subject: [PATCH] windows: fix video apply settings bug
Refs #72539
Change-Id: I2c7f3e1375d104db89188763bcafa6e78fe49891
---
src/media/video/winvideo/video_device_impl.cpp | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/media/video/winvideo/video_device_impl.cpp b/src/media/video/winvideo/video_device_impl.cpp
index f6cbf60f18..54e4a6a2f1 100644
--- a/src/media/video/winvideo/video_device_impl.cpp
+++ b/src/media/video/winvideo/video_device_impl.cpp
@@ -237,9 +237,11 @@ VideoDeviceImpl::applySettings(VideoSettings settings)
{
if (!settings.video_size.empty()) {
auto pmt = capMap_[settings.video_size];
- ((VIDEOINFOHEADER*) pmt->pbFormat)->AvgTimePerFrame = settings.framerate;
- if (FAILED(cInterface->streamConf_->SetFormat(capMap_[settings.video_size]))) {
- RING_ERR("Could not set settings.");
+ if (pmt != nullptr) {
+ ((VIDEOINFOHEADER*) pmt->pbFormat)->AvgTimePerFrame = settings.framerate;
+ if (FAILED(cInterface->streamConf_->SetFormat(capMap_[settings.video_size]))) {
+ RING_ERR("Could not set settings.");
+ }
}
}
}
--
GitLab