From 0895b8979491af29a35f71dd9e9550eea7cf39a6 Mon Sep 17 00:00:00 2001 From: Yuri Date: Wed, 15 Jul 2015 01:46:23 -0700 Subject: [PATCH] Prevent crashed when default video format not found. --- src/video/cameradevice.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/video/cameradevice.cpp b/src/video/cameradevice.cpp index 8e488803c..748551ae8 100644 --- a/src/video/cameradevice.cpp +++ b/src/video/cameradevice.cpp @@ -104,7 +104,7 @@ CameraDevice* CameraDevice::open(QString devName, VideoMode mode) } AVDictionary* options = nullptr; - if (false); + if (!iformat); #ifdef Q_OS_LINUX else if (devName.startsWith("x11grab#")) { @@ -255,7 +255,7 @@ QVector> CameraDevice::getDeviceList() if (!getDefaultInputFormat()) return devices; - if (false); + if (!iformat); #ifdef Q_OS_WIN else if (iformat->name == QString("dshow")) devices += DirectShow::getDeviceList(); @@ -294,7 +294,7 @@ QString CameraDevice::getDefaultDeviceName() QVector CameraDevice::getVideoModes(QString devName) { - if (false); + if (!iformat); #ifdef Q_OS_WIN else if (iformat->name == QString("dshow")) return DirectShow::getDeviceModes(devName);