Ensure height is even as we write two lines at once

Pick-to: 6.4
Fixes: QTBUG-103238
Change-Id: I50b0bd74760c8b6f35e307e1580fc3ea7b57cd0d
Reviewed-by: Lars Knoll <lars@knoll.priv.no>

1 files changed, 2 insertions, 0 deletions

diff --git a/src/multimedia/video/qvideoframeconversionhelper.cpp b/src/multimedia/video/qvideoframeconversionhelper.cpp
index c2323176f..ab226d0d8 100644
--- a/src/multimedia/video/qvideoframeconversionhelper.cpp
+++ b/src/multimedia/video/qvideoframeconversionhelper.cpp
@@ -31,6 +31,7 @@ static inline void planarYUV420_to_ARGB32(const uchar *y, int yStride,
                                           quint32 *rgb,
                                           int width, int height)
 {
+    height &= ~1;
     quint32 *rgb0 = rgb;
     quint32 *rgb1 = rgb + width;
 
@@ -379,6 +380,7 @@ static inline void planarYUV420_16bit_to_ARGB32(const uchar *y, int yStride,
                                           quint32 *rgb,
                                           int width, int height)
 {
+    height &= ~1;
     quint32 *rgb0 = rgb;
     quint32 *rgb1 = rgb + width;