diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-10-27 05:40:34 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-10-27 05:43:09 +0200 |
| commit | 732d9cb6848a42f5a61b2b74dece962cdfba1d31 (patch) | |
| tree | ccbc4894addfbdd10ec02bae3b30b238e0455785 /src/gsttools/qgstutils.cpp | |
| parent | fa8e1e71bb17efe2549d9e81768f19c065065fce (diff) | |
| parent | 08db8a408829cb3bbd204e71dd8d5616e7d21d3d (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
.qmake.conf
examples/multimedia/declarative-radio/view.qml
src/plugins/qnx/mediaplayer/mmrenderermediaplayercontrol.h
Change-Id: I97b507878b6de04ec38ddd13530e58b8f72390e4
Diffstat (limited to 'src/gsttools/qgstutils.cpp')
| -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; } } |