summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Stromme <christian.stromme@qt.io>2017-11-27 22:55:20 +0100
committerChristian Stromme <christian.stromme@qt.io>2017-12-01 13:22:04 +0000
commitc60d87c314d467997701729104ce02c9ed5c6501 (patch)
tree96e393ad3fc8f4adb6330976ef3487b73d2296a1
parent06eac9ba70ace125ea2835ef9aec854f231405b2 (diff)
downloadqtmultimedia-c60d87c314d467997701729104ce02c9ed5c6501.tar.gz
Revert "Android: Set the correct scan line for the video surface format"
The change causes the video output to be shown upside down. This reverts commit 2ec485482d185f92e4de33f634bc3ef9dd6c9188. Task-number: QTBUG-64764 Change-Id: I9d3e63d2c0cce17d945b62ffead38ab5f58ace7f Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io> (cherry picked from commit 3598915a360c596da48c9e7b00ba8469cba5249a)
-rw-r--r--src/plugins/android/src/common/qandroidvideooutput.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/plugins/android/src/common/qandroidvideooutput.cpp b/src/plugins/android/src/common/qandroidvideooutput.cpp
index eb41d4a8e..b425b9d89 100644
--- a/src/plugins/android/src/common/qandroidvideooutput.cpp
+++ b/src/plugins/android/src/common/qandroidvideooutput.cpp
@@ -324,7 +324,6 @@ void QAndroidTextureVideoOutput::onFrameAvailable()
if (!m_surface->isActive()) {
QVideoSurfaceFormat format(frame.size(), frame.pixelFormat(),
QAbstractVideoBuffer::GLTextureHandle);
- format.setScanLineDirection(QVideoSurfaceFormat::BottomToTop);
m_surface->start(format);
}