summaryrefslogtreecommitdiffstats
path: root/src/gsttools
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-06-18 03:00:15 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-06-18 03:00:15 +0200
commitc93df1bdc734fdd1e05d1ce7a92a81cb7af7ae3a (patch)
treed76fdea6b0955c5707ca7408741bf9e2b2d1f23c /src/gsttools
parent282356e3a1b1d95fd5d9433fb633a9692b84c8d7 (diff)
parent4cc6895d2f6bf6542623301c8deec1570d6dd916 (diff)
Merge remote-tracking branch 'origin/5.13' into dev
Diffstat (limited to 'src/gsttools')
-rw-r--r--src/gsttools/qgstutils.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gsttools/qgstutils.cpp b/src/gsttools/qgstutils.cpp
index 82af0f1e2..9806af0fe 100644
--- a/src/gsttools/qgstutils.cpp
+++ b/src/gsttools/qgstutils.cpp
@@ -649,7 +649,7 @@ QVector<QGstUtils::CameraInfo> QGstUtils::enumerateCameras(GstElementFactory *fa
for (; ::ioctl(fd, VIDIOC_ENUMINPUT, &input) >= 0; ++input.index) {
if (input.type == V4L2_INPUT_TYPE_CAMERA || input.type == 0) {
const int ret = ::ioctl(fd, VIDIOC_S_INPUT, &input.index);
- isCamera = (ret == 0 || errno == ENOTTY);
+ isCamera = (ret == 0 || errno == ENOTTY || errno == EBUSY);
break;
}
}