diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2021-05-16 21:26:28 +0200 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2021-05-26 17:43:50 +0000 |
commit | 99c8af32b182834d234e28fa6a9fbabaa1983296 (patch) | |
tree | 21b6fabbb9571e0d13060e00e4b08c65f152a39b /src/multimedia/video | |
parent | c773c45899dbdc93b606c9ea82e6f9a29a775258 (diff) |
Fix crashes on Linuxwip/qt6
Check for videosink and QPlatformMediaFormatInfo in QMediaFormat.
Change-Id: I9603dae66fc4eb6a4433f43d2464e9f97916235f
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Diffstat (limited to 'src/multimedia/video')
-rw-r--r-- | src/multimedia/video/qvideosink.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
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) |