summaryrefslogtreecommitdiffstats
path: root/src/gsttools
diff options
context:
space:
mode:
authorYoann Lopes <yoann.lopes@digia.com>2014-09-09 14:13:20 +0200
committerYoann Lopes <yoann.lopes@digia.com>2014-09-09 15:04:11 +0200
commitf65cf958b1a40d486854a1c2526d20e5a50a944b (patch)
treeb083b15e2d6b823d74ba5b43593b8208abd801a1 /src/gsttools
parentf803f87068658a2b4bf4ecd137229d084ab87ad4 (diff)
Fix V4L usage.
ff527de0 was submitted to 5.3 while cddbe873 was submitted to 5.4. The former's behavior was not preserved when 5.3 got merged into 5.4. Change-Id: I7435ea30634001ae6e87c316eb8a8ab6f5e988e3 Reviewed-by: Lisandro Damián Nicanor Pérez Meyer <perezmeyer@gmail.com> Reviewed-by: Andrew den Exter <andrew.den.exter@qinetic.com.au>
Diffstat (limited to 'src/gsttools')
-rw-r--r--src/gsttools/qgstutils.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/gsttools/qgstutils.cpp b/src/gsttools/qgstutils.cpp
index 9740b9a09..8d484aa6d 100644
--- a/src/gsttools/qgstutils.cpp
+++ b/src/gsttools/qgstutils.cpp
@@ -42,8 +42,10 @@
#include <QtCore/qstringlist.h>
#include <qaudioformat.h>
-#include <private/qcore_unix_p.h>
-#include <linux/videodev2.h>
+#ifdef USE_V4L
+# include <private/qcore_unix_p.h>
+# include <linux/videodev2.h>
+#endif
#include "qgstreamervideoinputdevicecontrol_p.h"
@@ -469,6 +471,7 @@ QVector<QGstUtils::CameraInfo> QGstUtils::enumerateCameras(GstElementFactory *fa
}
}
+#ifdef USE_V4L
QDir devDir(QStringLiteral("/dev"));
devDir.setFilter(QDir::System);
@@ -516,6 +519,7 @@ QVector<QGstUtils::CameraInfo> QGstUtils::enumerateCameras(GstElementFactory *fa
}
qt_safe_close(fd);
}
+#endif // USE_V4L
return devices;
}