Merge branch 'dev' of git://code.qt.io/qt/qtmultimedia into wip/qt6

Change-Id: I91e8d902cd916ee16a2495da9bf40a34c6bc05d2

1 files changed, 3 insertions, 3 deletions

diff --git a/src/plugins/directshow/camera/dscameraservice.h b/src/plugins/directshow/camera/dscameraservice.h
index 9a8f745f6..6ea85b725 100644
--- a/src/plugins/directshow/camera/dscameraservice.h
+++ b/src/plugins/directshow/camera/dscameraservice.h
@@ -64,7 +64,7 @@ class DSCameraService : public QMediaService
     Q_OBJECT
 
 public:
-    DSCameraService(QObject *parent = 0);
+    DSCameraService(QObject *parent = nullptr);
     ~DSCameraService() override;
 
     QMediaControl* requestControl(const char *name) override;
@@ -74,14 +74,14 @@ private:
     DSCameraSession        *m_session;
     DSCameraControl        *m_control;
     DSVideoDeviceControl   *m_videoDevice;
-    QMediaControl          *m_videoRenderer;
+    QMediaControl          *m_videoRenderer = nullptr;
     DSImageCaptureControl  *m_imageCapture;
     DSCameraViewfinderSettingsControl *m_viewfinderSettings;
     DSCameraImageProcessingControl *m_imageProcessingControl;
     DirectShowCameraExposureControl *m_exposureControl;
     DirectShowCameraCaptureDestinationControl *m_captureDestinationControl;
     DirectShowCameraCaptureBufferFormatControl *m_captureBufferFormatControl;
-    DirectShowVideoProbeControl *m_videoProbeControl;
+    DirectShowVideoProbeControl *m_videoProbeControl = nullptr;
     DirectShowCameraZoomControl *m_zoomControl;
     DirectShowCameraImageEncoderControl *m_imageEncoderControl;
 };