diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/multimedia/video/qvideotexturehelper.cpp | 2 | ||||
| -rw-r--r-- | src/multimediaquick/qsgvideonode_p.cpp | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/multimedia/video/qvideotexturehelper.cpp b/src/multimedia/video/qvideotexturehelper.cpp index df820e638..3b731182c 100644 --- a/src/multimedia/video/qvideotexturehelper.cpp +++ b/src/multimedia/video/qvideotexturehelper.cpp @@ -377,7 +377,9 @@ static QMatrix4x4 yuvColorCorrectionMatrix(float brightness, float contrast, flo void updateUniformData(QByteArray *dst, const QVideoFrameFormat &format, const QVideoFrame &frame, const QMatrix4x4 &transform, float opacity) { +#ifndef Q_OS_ANDROID Q_UNUSED(frame); +#endif QMatrix4x4 cmat; switch (format.pixelFormat()) { diff --git a/src/multimediaquick/qsgvideonode_p.cpp b/src/multimediaquick/qsgvideonode_p.cpp index 9445f3d40..968fe374d 100644 --- a/src/multimediaquick/qsgvideonode_p.cpp +++ b/src/multimediaquick/qsgvideonode_p.cpp @@ -242,7 +242,8 @@ bool QSGVideoMaterialRhiShader::updateUniformData(RenderState &state, QSGMateria // updated by this function and we need that already in updateUniformData. m->updateTextures(state.rhi(), state.resourceUpdateBatch()); - m_format.updateUniformData(state.uniformData(), m_material->m_frame, state.combinedMatrix(), state.opacity()); + m_format.updateUniformData(state.uniformData(), m->m_frame, + state.combinedMatrix(), state.opacity()); return true; } |