diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-07-09 03:06:48 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-07-09 03:06:48 +0200 |
commit | c028369e084bd4f89b1c124ec915db54d07674ef (patch) | |
tree | 38cd411766b72d2808e3bb356470aa460b7cd82d /src | |
parent | 2857223212ef56810b61ea97fb977573700ab1e0 (diff) | |
parent | 05359c5bb6cd0e5adc23b2de3890df4af93bdf7c (diff) | |
download | qtwayland-c028369e084bd4f89b1c124ec915db54d07674ef.tar.gz |
Merge remote-tracking branch 'origin/5.13' into dev
Change-Id: Ia74c2459057ef681b59a3201cab34168016e78d0
Diffstat (limited to 'src')
-rw-r--r-- | src/hardwareintegration/compositor/linux-dmabuf-unstable-v1/linuxdmabufclientbufferintegration.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/hardwareintegration/compositor/linux-dmabuf-unstable-v1/linuxdmabufclientbufferintegration.cpp b/src/hardwareintegration/compositor/linux-dmabuf-unstable-v1/linuxdmabufclientbufferintegration.cpp index a85f2454..d512613a 100644 --- a/src/hardwareintegration/compositor/linux-dmabuf-unstable-v1/linuxdmabufclientbufferintegration.cpp +++ b/src/hardwareintegration/compositor/linux-dmabuf-unstable-v1/linuxdmabufclientbufferintegration.cpp @@ -263,7 +263,7 @@ LinuxDmabufClientBufferIntegration::LinuxDmabufClientBufferIntegration() YuvFormatConversion { .inputPlanes = 1, .outputPlanes = 2, - {{ + .plane = {{ .format = DRM_FORMAT_GR88, .widthDivisor = 1, .heightDivisor = 1, |