diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-10-27 05:40:34 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-10-27 05:43:09 +0200 |
| commit | 732d9cb6848a42f5a61b2b74dece962cdfba1d31 (patch) | |
| tree | ccbc4894addfbdd10ec02bae3b30b238e0455785 /src/plugins/android/src/common | |
| parent | fa8e1e71bb17efe2549d9e81768f19c065065fce (diff) | |
| parent | 08db8a408829cb3bbd204e71dd8d5616e7d21d3d (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
.qmake.conf
examples/multimedia/declarative-radio/view.qml
src/plugins/qnx/mediaplayer/mmrenderermediaplayercontrol.h
Change-Id: I97b507878b6de04ec38ddd13530e58b8f72390e4
Diffstat (limited to 'src/plugins/android/src/common')
| -rw-r--r-- | src/plugins/android/src/common/qandroidvideooutput.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/plugins/android/src/common/qandroidvideooutput.cpp b/src/plugins/android/src/common/qandroidvideooutput.cpp index b425b9d89..eb41d4a8e 100644 --- a/src/plugins/android/src/common/qandroidvideooutput.cpp +++ b/src/plugins/android/src/common/qandroidvideooutput.cpp @@ -324,6 +324,7 @@ void QAndroidTextureVideoOutput::onFrameAvailable() if (!m_surface->isActive()) { QVideoSurfaceFormat format(frame.size(), frame.pixelFormat(), QAbstractVideoBuffer::GLTextureHandle); + format.setScanLineDirection(QVideoSurfaceFormat::BottomToTop); m_surface->start(format); } |