From 99c8af32b182834d234e28fa6a9fbabaa1983296 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Sun, 16 May 2021 21:26:28 +0200 Subject: Fix crashes on Linux Check for videosink and QPlatformMediaFormatInfo in QMediaFormat. Change-Id: I9603dae66fc4eb6a4433f43d2464e9f97916235f Reviewed-by: Volker Hilsheimer --- src/multimedia/video/qvideosink.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'src/multimedia/video/qvideosink.cpp') diff --git a/src/multimedia/video/qvideosink.cpp b/src/multimedia/video/qvideosink.cpp index 3776b603b..18afcbfad 100644 --- a/src/multimedia/video/qvideosink.cpp +++ b/src/multimedia/video/qvideosink.cpp @@ -157,7 +157,8 @@ void QVideoSink::setNativeWindowId(WId id) if (d->window == id) return; d->window = id; - d->videoSink->setWinId(id); + if (d->videoSink != nullptr) + d->videoSink->setWinId(id); } /*! @@ -228,7 +229,8 @@ void QVideoSink::setTargetRect(const QRectF &rect) if (d->targetRect == rect) return; d->targetRect = rect; - d->videoSink->setDisplayRect(rect.toRect()); + if (d->videoSink != nullptr) + d->videoSink->setDisplayRect(rect.toRect()); } float QVideoSink::brightness() const @@ -399,7 +401,7 @@ QPlatformVideoSink *QVideoSink::platformVideoSink() const */ QSize QVideoSink::videoSize() const { - return d->videoSink->nativeSize(); + return d->videoSink ? d->videoSink->nativeSize() : QSize{}; } void QVideoSink::setSource(QObject *source) -- cgit v1.2.3