From eec1381606506f80576dc621a7d83328ca18468b Mon Sep 17 00:00:00 2001 From: Yoann Lopes Date: Thu, 13 Mar 2014 19:32:15 +0100 Subject: Fix crash in QCameraInfo when no camera is available on the system. Change-Id: I04bea9d6afcf567c64788c3765cc6626dc9cd482 Reviewed-by: Christian Stromme --- src/multimedia/camera/qcamerainfo.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/multimedia') 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); -- cgit v1.2.3 From 023c6ebcb9d990042f0e9a750fd6238d22001022 Mon Sep 17 00:00:00 2001 From: Yoann Lopes Date: Thu, 20 Mar 2014 19:20:24 +0100 Subject: GStreamer: fix memory leaks. Many GStreamer objects were not properly managed or never released. Change-Id: I38b3854e8b9e2264b5b647f331d3bb16b886e2d6 Reviewed-by: Andrew den Exter --- src/multimedia/gsttools_headers/qgstutils_p.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/multimedia') 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 &supportedMimeTypeSet); } +void qt_gst_object_ref_sink(gpointer object); + QT_END_NAMESPACE #endif -- cgit v1.2.3