diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-09-15 03:00:51 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-09-15 03:00:51 +0200 |
commit | 3ee5afe3a47152ab3a2d4a9acf3a5e0458441c98 (patch) | |
tree | 3ec63ae7b0a8be146b7fed8676fcbe5cdded3f01 | |
parent | 1ca79e8645f9f3cf471c32cf9fd2894a4b41bcb1 (diff) | |
parent | 2c5efb49495e31afa399a1c1ea003a9b630ba113 (diff) |
Merge remote-tracking branch 'origin/5.11' into 5.12
Change-Id: I70d51b09681a77e72ecad764e37697d0a1bb85a5
-rw-r--r-- | dist/changes-5.11.2 | 61 | ||||
-rw-r--r-- | src/plugins/pulseaudio/qaudiooutput_pulse.cpp | 2 |
2 files changed, 62 insertions, 1 deletions
diff --git a/dist/changes-5.11.2 b/dist/changes-5.11.2 new file mode 100644 index 000000000..a3bc3b229 --- /dev/null +++ b/dist/changes-5.11.2 @@ -0,0 +1,61 @@ +Qt 5.11.2 is a bug-fix release. It maintains both forward and backward +compatibility (source and binary) with Qt 5.11.0 through 5.11.1. + +For more details, refer to the online documentation included in this +distribution. The documentation is also available online: + +http://doc.qt.io/qt-5/index.html + +The Qt version 5.11 series is binary compatible with the 5.10.x series. +Applications compiled for 5.10 will continue to run with 5.11. + +Some of the changes listed in this file include issue tracking numbers +corresponding to tasks in the Qt Bug Tracker: + +https://bugreports.qt.io/ + +Each of these identifiers can be entered in the bug tracker to obtain more +information about a particular change. + +**************************************************************************** +* Qt 5.11.2 Changes * +**************************************************************************** + + - [QTBUG-66910] Fixed warning on deleteLater on nullptr in QSampleCache. + +**************************************************************************** +* Platform Specific Changes * +**************************************************************************** + +Gstreamer +--------- + + - [QTBUG-60884] Setting a custom video source through QT_GSTREAMER_CAMERABIN_VIDEOSRC + will now use gst_parse_launch(). + - [QTBUG-69468] gst_bus_remove_watch() will now be used if available. + - [QTBUG-69895] The video profile is now correctly set before CamerBin enters GST_STATE_READY. + - Fixed crash when resolution or frame rates are requested on an unloaded camera. + +Directshow +---------- + + - Removed reporting of failure for stream source with no video output. + - [QTBUG-69143] Postponed setting camera image processing param if not ready. + - [QTBUG-68035] Added a notification if camera has been unplugged. + +WinRT +----- + + - [QTBUG-67417] Obtained new camera sample format and size on camera change. + +AVFoundation +------------ + + - [QTBUG-65740] Fixed crash when no video capture device. + - [QTBUG-69076] Fixed linker error when building Qt without opengl support. + - Improved how context sharing is set-up in frame renderer. + +Android +------- + + - [QTBUG-68998] Fixed the player state when play() is called with no media. diff --git a/src/plugins/pulseaudio/qaudiooutput_pulse.cpp b/src/plugins/pulseaudio/qaudiooutput_pulse.cpp index 38cf54979..ea7a2be0c 100644 --- a/src/plugins/pulseaudio/qaudiooutput_pulse.cpp +++ b/src/plugins/pulseaudio/qaudiooutput_pulse.cpp @@ -447,7 +447,7 @@ void QPulseAudioOutput::userFeed() int audioBytesPulled = m_audioSource->read(m_audioBuffer, input); Q_ASSERT(audioBytesPulled <= input); - if (audioBytesPulled > 0) { + if (m_audioBuffer && audioBytesPulled > 0) { if (audioBytesPulled > input) { qWarning() << "QPulseAudioOutput::userFeed() - Invalid audio data size provided from user:" << audioBytesPulled << "should be less than" << input; |