diff options
author | Liang Qi <liang.qi@qt.io> | 2018-01-06 09:47:33 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2018-01-06 09:47:33 +0100 |
commit | 7a3b8907060123fe5d487d4c9ba3a1e222f468bb (patch) | |
tree | cb419d68eedddc1adbd6dbb84888767edc7fb3bf /src/qtmultimediaquicktools | |
parent | 4a6f459d193b621a77e002944eb28e4e96f2e2c7 (diff) | |
parent | 13df2988efbe9a82225ccbf4cad463391d94c8e8 (diff) | |
download | qtmultimedia-7a3b8907060123fe5d487d4c9ba3a1e222f468bb.tar.gz |
Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
.qmake.conf
Change-Id: I3d6e69f3f99b2f0a0e2c29ffdd02176e1f22304e
Diffstat (limited to 'src/qtmultimediaquicktools')
-rw-r--r-- | src/qtmultimediaquicktools/qdeclarativevideooutput_render.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qtmultimediaquicktools/qdeclarativevideooutput_render.cpp b/src/qtmultimediaquicktools/qdeclarativevideooutput_render.cpp index f1b7662b5..0cb6659ca 100644 --- a/src/qtmultimediaquicktools/qdeclarativevideooutput_render.cpp +++ b/src/qtmultimediaquicktools/qdeclarativevideooutput_render.cpp @@ -382,9 +382,9 @@ QAbstractVideoSurface *QDeclarativeVideoRendererBackend::videoSurface() const QRectF QDeclarativeVideoRendererBackend::adjustedViewport() const { const QRectF viewport = m_surface->surfaceFormat().viewport(); - const QSize pixelAspectRatio = m_surface->surfaceFormat().pixelAspectRatio(); + const QSizeF pixelAspectRatio = m_surface->surfaceFormat().pixelAspectRatio(); - if (pixelAspectRatio.height() != 0) { + if (pixelAspectRatio.isValid()) { const qreal ratio = pixelAspectRatio.width() / pixelAspectRatio.height(); QRectF result = viewport; result.setX(result.x() * ratio); |