Fix V4L usage.
ff527de0was submitted to 5.3 whilecddbe873was 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>
This commit is contained in:
@@ -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;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user