diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-12-08 13:58:26 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-12-08 13:58:26 +0100 |
| commit | c0931a0709748f2483aeea17555d6953b6f28417 (patch) | |
| tree | 0de7ead5aec5a27ccf71a09a56eeb08e66a3f054 /src/plugins | |
| parent | 0e7fb980e37e73748c7bdb0dbf17950c8afafc79 (diff) | |
| parent | 3598915a360c596da48c9e7b00ba8469cba5249a (diff) | |
Merge remote-tracking branch 'origin/5.10.0' into 5.10
Change-Id: Iffeb04c00f5b9e7a51320570ea47e84d80fae844
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/android/src/common/qandroidvideooutput.cpp | 1 | ||||
| -rw-r--r-- | src/plugins/wasapi/qwasapiaudiodeviceinfo.cpp | 2 |
2 files changed, 1 insertions, 2 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); } diff --git a/src/plugins/wasapi/qwasapiaudiodeviceinfo.cpp b/src/plugins/wasapi/qwasapiaudiodeviceinfo.cpp index e1a46841d..53345dec8 100644 --- a/src/plugins/wasapi/qwasapiaudiodeviceinfo.cpp +++ b/src/plugins/wasapi/qwasapiaudiodeviceinfo.cpp @@ -47,7 +47,7 @@ QT_BEGIN_NAMESPACE Q_LOGGING_CATEGORY(lcMmDeviceInfo, "qt.multimedia.deviceinfo") QWasapiAudioDeviceInfo::QWasapiAudioDeviceInfo(QByteArray dev, QAudio::Mode mode) - : m_deviceName(dev) + : m_deviceName(QString::fromLocal8Bit(dev)) { qCDebug(lcMmDeviceInfo) << __FUNCTION__ << dev << mode; m_interface = QWasapiUtils::createOrGetInterface(dev, mode); |