summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPiotr Srebrny <piotr.srebrny@qt.io>2022-11-09 11:35:30 +0100
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2022-11-09 12:44:56 +0000
commite2b0be5f9c690fa7dfaaf62b02f5b1b3b7f80d1f (patch)
tree37b89a247ff8629c1bf134ef4e6e58910e01a642
parent3fd4de78d83fc2646bde590cf18c93a678836e99 (diff)
downloadqtmultimedia-e2b0be5f9c690fa7dfaaf62b02f5b1b3b7f80d1f.tar.gz
Ensure height is even as we write two lines at once
Fixes: QTBUG-103238 Change-Id: I50b0bd74760c8b6f35e307e1580fc3ea7b57cd0d Reviewed-by: Lars Knoll <lars@knoll.priv.no> (cherry picked from commit c67855345475fd293e9a2a6921328e356f881d06) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--src/multimedia/video/qvideoframeconversionhelper.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/multimedia/video/qvideoframeconversionhelper.cpp b/src/multimedia/video/qvideoframeconversionhelper.cpp
index 726eec244..d228c2392 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;