From 1b630c9b4961956ca121b8dd50ea6b33ab6c43c3 Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Thu, 20 May 2021 10:35:57 +0200 Subject: Fix a crash on macOS when running the qquickvideooutput autotest Just requires a nullptr check. Change-Id: I0e5b0cd75079bbce94529835e6512d99aace08f0 Reviewed-by: Doris Verria Reviewed-by: Lars Knoll --- src/imports/multimedia/qmldir | 1 - src/multimedia/platform/darwin/mediaplayer/avfmediaplayer.mm | 2 +- 2 files changed, 1 insertion(+), 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(sink->platformVideoSink()); + m_videoSink = sink ? static_cast(sink->platformVideoSink()): nullptr; m_videoOutput->setVideoSink(m_videoSink); } -- cgit v1.2.3