diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-05-14 21:04:02 +0200 |
|---|---|---|
| committer | VaL Doroshchuk <valentyn.doroshchuk@qt.io> | 2020-05-29 07:24:08 +0000 |
| commit | cf28371c1edd0c6d04c4518cdf3270067d0cf8a7 (patch) | |
| tree | 4d0bda941994274000163d7320197a6ba8e9d565 /src/plugins/videonode/imx6/qsgvivantevideomaterial.h | |
| parent | c95aa0e1836f230b2ba3158c65d0767223dd1937 (diff) | |
| parent | 89f92578ece66aaa50e03cacd81434cd18006185 (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Conflicts:
examples/multimedia/audiodecoder/audiodecoder.cpp
examples/multimedia/audiodecoder/main.cpp
src/multimedia/playback/qmediaplayer.cpp
Change-Id: I8cf1293023c09069745aa3aa6df49b1e0a8a1c22
Diffstat (limited to 'src/plugins/videonode/imx6/qsgvivantevideomaterial.h')
| -rw-r--r-- | src/plugins/videonode/imx6/qsgvivantevideomaterial.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/videonode/imx6/qsgvivantevideomaterial.h b/src/plugins/videonode/imx6/qsgvivantevideomaterial.h index adbd960a4..db59e8fc7 100644 --- a/src/plugins/videonode/imx6/qsgvivantevideomaterial.h +++ b/src/plugins/videonode/imx6/qsgvivantevideomaterial.h @@ -78,7 +78,7 @@ private: QVideoFrame::PixelFormat mFormat; QMap<const uchar*, GLuint> mBitsToTextureMap; - QVideoFrame mCurrentFrame, mNextFrame; + QVideoFrame mCurrentFrame; GLuint mCurrentTexture; bool mMappable; GLenum mMapError = GL_NO_ERROR; |