diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-08-13 03:01:49 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-08-13 03:01:49 +0200 |
| commit | 97213e13cd7f2ccae1d5215bbb503f8f59c0ad22 (patch) | |
| tree | f5586f079726cf909b48bd9e55fa1b5e18381801 /src/plugins/avfoundation/mediaplayer | |
| parent | 2da4e162516830f4976f30c789a3fd9511dde932 (diff) | |
| parent | 075fa6203856bdf9f58e737ee2f5d2a843a85cad (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: I428528333e89214d96acef5c2ba8ea832b2b145f
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 |