diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-10-27 07:15:28 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-10-27 07:15:35 +0200 |
| commit | 1cb4027e0a59e1875db88b72afb5833aafbd87eb (patch) | |
| tree | 35646da4972db8bff385ec4147161d133e7bf1b8 /src/gsttools | |
| parent | 82694e41b1d37e04ecc911f420ad4317220f8180 (diff) | |
| parent | 732d9cb6848a42f5a61b2b74dece962cdfba1d31 (diff) | |
Merge remote-tracking branch 'origin/5.10' into dev
Change-Id: Ib509a8c90dd6c7229510a400612cc27a4957d015
Diffstat (limited to 'src/gsttools')
| -rw-r--r-- | src/gsttools/qgstutils.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gsttools/qgstutils.cpp b/src/gsttools/qgstutils.cpp index 820ac84b4..6a573fa78 100644 --- a/src/gsttools/qgstutils.cpp +++ b/src/gsttools/qgstutils.cpp @@ -642,7 +642,8 @@ QVector<QGstUtils::CameraInfo> QGstUtils::enumerateCameras(GstElementFactory *fa memset(&input, 0, sizeof(input)); for (; ::ioctl(fd, VIDIOC_ENUMINPUT, &input) >= 0; ++input.index) { if (input.type == V4L2_INPUT_TYPE_CAMERA || input.type == 0) { - isCamera = ::ioctl(fd, VIDIOC_S_INPUT, input.index) != 0; + const int ret = ::ioctl(fd, VIDIOC_S_INPUT, &input.index); + isCamera = (ret == 0 || errno == ENOTTY); break; } } |