diff options
Diffstat (limited to 'src/multimedia')
| -rw-r--r-- | src/multimedia/camera/qcamerainfo.cpp | 2 | ||||
| -rw-r--r-- | src/multimedia/gsttools_headers/qgstutils_p.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/multimedia/camera/qcamerainfo.cpp b/src/multimedia/camera/qcamerainfo.cpp index 218219c7e..230b71222 100644 --- a/src/multimedia/camera/qcamerainfo.cpp +++ b/src/multimedia/camera/qcamerainfo.cpp @@ -104,7 +104,7 @@ QCameraInfo::QCameraInfo(const QCamera &camera) : d(new QCameraInfoPrivate) { const QVideoDeviceSelectorControl *deviceControl = camera.d_func()->deviceControl; - if (deviceControl) { + if (deviceControl && deviceControl->deviceCount() > 0) { const int selectedDevice = deviceControl->selectedDevice(); d->deviceName = deviceControl->deviceName(selectedDevice); d->description = deviceControl->deviceDescription(selectedDevice); diff --git a/src/multimedia/gsttools_headers/qgstutils_p.h b/src/multimedia/gsttools_headers/qgstutils_p.h index 568580264..eea1e15d9 100644 --- a/src/multimedia/gsttools_headers/qgstutils_p.h +++ b/src/multimedia/gsttools_headers/qgstutils_p.h @@ -78,6 +78,8 @@ namespace QGstUtils { const QSet<QString> &supportedMimeTypeSet); } +void qt_gst_object_ref_sink(gpointer object); + QT_END_NAMESPACE #endif |