diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-08-17 03:00:51 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-08-17 03:00:51 +0200 |
| commit | a31d981b08519922b4c9c17b17122c02c1734ef4 (patch) | |
| tree | bf2068df8fa1158aa1c1d7eef3cf17dd13cc363d /src/plugins/avfoundation/mediaplayer | |
| parent | f49bfa05d1f67327a33d2b66e9ff1bcc32ad8d05 (diff) | |
| parent | 7b1bb300166aa19dc0f4c6838eb6d284af73236c (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Change-Id: I09f511d894db5e9987ac2b9e42266bb87ef0161d
Diffstat (limited to 'src/plugins/avfoundation/mediaplayer')
| -rw-r--r-- | src/plugins/avfoundation/mediaplayer/avfvideoframerenderer.mm | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/plugins/avfoundation/mediaplayer/avfvideoframerenderer.mm b/src/plugins/avfoundation/mediaplayer/avfvideoframerenderer.mm index 392960e4d..51f961729 100644 --- a/src/plugins/avfoundation/mediaplayer/avfvideoframerenderer.mm +++ b/src/plugins/avfoundation/mediaplayer/avfvideoframerenderer.mm @@ -159,6 +159,13 @@ QOpenGLFramebufferObject *AVFVideoFrameRenderer::initRenderer(AVPlayerLayer *lay qWarning("failed to create QOpenGLContext"); return nullptr; } + + // CARenderer must be re-created with different current context, so release it now. + // See lines below where m_videoLayerRenderer is constructed. + if (m_videoLayerRenderer) { + [m_videoLayerRenderer release]; + m_videoLayerRenderer = nullptr; + } } //Need current context |