summaryrefslogtreecommitdiffstats
path: root/src/imports/multimedia/qmldir
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@qt.io>2021-05-26 13:05:31 +0200
committerLars Knoll <lars.knoll@qt.io>2021-05-26 11:16:05 +0000
commitc773c45899dbdc93b606c9ea82e6f9a29a775258 (patch)
tree82e94f0ffa7a1476bce76cc7b0bfe8e3eec4c7ad /src/imports/multimedia/qmldir
parentddf481c1bb251f8c4d2fe5e9ad6394c985f94f34 (diff)
Fix a deadlock when changing the video output
Changing the videooutput and deleting the mediaplayer directly afterwards could lead to a deadlock, as the videosink was blocking on a pad and then calling a slot on the main thread using a blocking queued connection. If the main thread was changing the state of the gst pipeline at the same time, this could lead to a deadlock. Avoid it by pausing the pipeline before changing the video output. Change-Id: I0d0cbad0ab97a4eb83dd3c66c664c01de3b0ea90 Reviewed-by: Doris Verria <doris.verria@qt.io> Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/imports/multimedia/qmldir')
-rw-r--r--src/imports/multimedia/qmldir1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/imports/multimedia/qmldir b/src/imports/multimedia/qmldir
index 028587088..387cb3c14 100644
--- a/src/imports/multimedia/qmldir
+++ b/src/imports/multimedia/qmldir
@@ -4,3 +4,4 @@ classname QMultimediaDeclarativeModule
typeinfo plugins.qmltypes
prefer :/qt-project.org/imports/QtMultimedia/
Video 5.0 Video.qml
+