Fix tst_qvideoframe test failures

Change-Id: I25bceb948518ba49053ae87484bdd8375b616b20
Reviewed-by: André de la Rocha <andre.rocha@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>

1 files changed, 3 insertions, 1 deletions

diff --git a/src/multimedia/video/qvideoframe.cpp b/src/multimedia/video/qvideoframe.cpp
index 8f95706bb..a120d850b 100644
--- a/src/multimedia/video/qvideoframe.cpp
+++ b/src/multimedia/video/qvideoframe.cpp
@@ -291,7 +291,7 @@ QVideoFrame::QVideoFrame(const QVideoFrameFormat &format)
 
         // Check the memory was successfully allocated.
         if (!data.isEmpty())
-            d->buffer = new QMemoryVideoBuffer(data, textureDescription->stride*format.frameWidth());
+            d->buffer = new QMemoryVideoBuffer(data, textureDescription->strideForWidth(format.frameWidth()));
     }
 }
 
@@ -751,6 +751,8 @@ int QVideoFrame::planeCount() const
 */
 quint64 QVideoFrame::textureHandle(int plane) const
 {
+    if (!d->buffer)
+        return 0;
     return d->buffer->textureHandle(plane);
 }