diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2021-05-20 10:35:57 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2021-05-20 09:08:16 +0000 |
| commit | 1b630c9b4961956ca121b8dd50ea6b33ab6c43c3 (patch) | |
| tree | e10a2109246542e3f3c4de211e025a553036bd6f | |
| parent | 230bb73b4bda97c59046a59176d738c3e9ac52d9 (diff) | |
Fix a crash on macOS when running the qquickvideooutput autotest
Just requires a nullptr check.
Change-Id: I0e5b0cd75079bbce94529835e6512d99aace08f0
Reviewed-by: Doris Verria <doris.verria@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
| -rw-r--r-- | src/imports/multimedia/qmldir | 1 | ||||
| -rw-r--r-- | src/multimedia/platform/darwin/mediaplayer/avfmediaplayer.mm | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/src/imports/multimedia/qmldir b/src/imports/multimedia/qmldir index 387cb3c14..028587088 100644 --- a/src/imports/multimedia/qmldir +++ b/src/imports/multimedia/qmldir @@ -4,4 +4,3 @@ classname QMultimediaDeclarativeModule typeinfo plugins.qmltypes prefer :/qt-project.org/imports/QtMultimedia/ Video 5.0 Video.qml - diff --git a/src/multimedia/platform/darwin/mediaplayer/avfmediaplayer.mm b/src/multimedia/platform/darwin/mediaplayer/avfmediaplayer.mm index 9aa3354f5..3d6fa67ae 100644 --- a/src/multimedia/platform/darwin/mediaplayer/avfmediaplayer.mm +++ b/src/multimedia/platform/darwin/mediaplayer/avfmediaplayer.mm @@ -514,7 +514,7 @@ AVFMediaPlayer::~AVFMediaPlayer() void AVFMediaPlayer::setVideoSink(QVideoSink *sink) { - m_videoSink = static_cast<AVFVideoSink *>(sink->platformVideoSink()); + m_videoSink = sink ? static_cast<AVFVideoSink *>(sink->platformVideoSink()): nullptr; m_videoOutput->setVideoSink(m_videoSink); } |