Merge remote-tracking branch 'origin/5.4' into dev
Conflicts: .qmake.conf Change-Id: I31e377cdccf8bf5c1ea8143faf2001ac99608c27
This commit is contained in:
@@ -616,6 +616,8 @@ QVector<QGstUtils::CameraInfo> QGstUtils::enumerateCameras(GstElementFactory *fa
|
||||
} else {
|
||||
driver = QByteArray((const char*)vcap.driver);
|
||||
name = QString::fromUtf8((const char*)vcap.card);
|
||||
if (name.isEmpty())
|
||||
name = entryInfo.fileName();
|
||||
}
|
||||
//qDebug() << "found camera: " << name;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user