diff options
| author | Yoann Lopes <yoann.lopes@theqtcompany.com> | 2015-01-23 12:22:50 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2015-01-23 12:22:50 +0100 |
| commit | 2f494446388e314286506eae335439b7bbc75736 (patch) | |
| tree | 5b8e9ee8f8bb5ead36329017f0631489f70ea437 /src/plugins/videonode | |
| parent | d07a22c8848fa2bf0088c961785c799cea49a833 (diff) | |
| parent | af2d5a181c3d48e04c2459d551f320cfd7186630 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.4' into dev" into refs/staging/dev
Diffstat (limited to 'src/plugins/videonode')
| -rw-r--r-- | src/plugins/videonode/imx6/qsgvivantevideonode.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/plugins/videonode/imx6/qsgvivantevideonode.cpp b/src/plugins/videonode/imx6/qsgvivantevideonode.cpp index a42b577d5..1c1c1008b 100644 --- a/src/plugins/videonode/imx6/qsgvivantevideonode.cpp +++ b/src/plugins/videonode/imx6/qsgvivantevideonode.cpp @@ -61,6 +61,7 @@ void QSGVivanteVideoNode::setCurrentFrame(const QVideoFrame &frame) const QMap<QVideoFrame::PixelFormat, GLenum>& QSGVivanteVideoNode::getVideoFormat2GLFormatMap() { if (static_VideoFormat2GLFormatMap.isEmpty()) { + static_VideoFormat2GLFormatMap.insert(QVideoFrame::Format_YUV420P, GL_VIV_I420); static_VideoFormat2GLFormatMap.insert(QVideoFrame::Format_YV12, GL_VIV_YV12); static_VideoFormat2GLFormatMap.insert(QVideoFrame::Format_NV12, GL_VIV_NV12); static_VideoFormat2GLFormatMap.insert(QVideoFrame::Format_NV21, GL_VIV_NV21); |