diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-08-03 03:01:58 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-08-03 03:01:58 +0200 |
commit | 97fdacf3a1afc86bd5c14570b7f2d8bd64c492a2 (patch) | |
tree | 3aadbc8c7b8f00321dd3b2069f4a9d878793aa4d /src/plugins/avfoundation | |
parent | dbdcc1b099dc25ffb707a2441191463de33c51f3 (diff) | |
parent | 26c4e47afacf8b4072fb8500111fe471672e7e37 (diff) |
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: Ic69cafce59e842ec05a90544e10c0bcebf5daeec
Diffstat (limited to 'src/plugins/avfoundation')
-rw-r--r-- | src/plugins/avfoundation/mediaplayer/avfvideoframerenderer.mm | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/plugins/avfoundation/mediaplayer/avfvideoframerenderer.mm b/src/plugins/avfoundation/mediaplayer/avfvideoframerenderer.mm index b2c6638cc..392960e4d 100644 --- a/src/plugins/avfoundation/mediaplayer/avfvideoframerenderer.mm +++ b/src/plugins/avfoundation/mediaplayer/avfvideoframerenderer.mm @@ -135,12 +135,14 @@ QOpenGLFramebufferObject *AVFVideoFrameRenderer::initRenderer(AVPlayerLayer *lay || (!QOpenGLContext::currentContext() && !m_glContext)) { //Create Hidden QWindow surface to create context in this thread + delete m_offscreenSurface; m_offscreenSurface = new QWindow(); m_offscreenSurface->setSurfaceType(QWindow::OpenGLSurface); //Needs geometry to be a valid surface, but size is not important m_offscreenSurface->setGeometry(0, 0, 1, 1); m_offscreenSurface->create(); + delete m_glContext; m_glContext = new QOpenGLContext(); m_glContext->setFormat(m_offscreenSurface->requestedFormat()); |