diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-06-15 03:01:23 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-06-15 03:01:23 +0200 |
| commit | a7a9e9aa419252e57dc421e6af5781661d7b1af8 (patch) | |
| tree | 037a707167fbb2717093d79a18fe3b59334996c9 /src/gsttools | |
| parent | 293566a1841151cf0a374af7016a396c943ab96e (diff) | |
| parent | 8933a59719a5f0c33d47f202d220a566765ec6d4 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: Ib819180a25ceedfb072362d55d30f94e40a44f9b
Diffstat (limited to 'src/gsttools')
| -rw-r--r-- | src/gsttools/qgstutils.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gsttools/qgstutils.cpp b/src/gsttools/qgstutils.cpp index 06f277766..48781b0c7 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; } } |