diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-07-10 10:14:36 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-07-10 10:14:36 +0200 |
| commit | 074bd6ab37bbbb4dbba188921783fd98be872555 (patch) | |
| tree | 318284e5ce86569c6d0c9c37d143b6f63781eede /src/plugins/gstreamer/mediaplayer | |
| parent | 4ba4f1a51db14c1df20b27cc375255077f051819 (diff) | |
| parent | 8da61153c9b4e505b6f8a0e7a6c630690516d845 (diff) | |
Merge remote-tracking branch 'origin/5.3' into dev
Change-Id: I38ebcb3da0e4d2acc9e7108c9579ea98323864e0
Diffstat (limited to 'src/plugins/gstreamer/mediaplayer')
| -rw-r--r-- | src/plugins/gstreamer/mediaplayer/qgstreamerplayercontrol.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/gstreamer/mediaplayer/qgstreamerplayercontrol.cpp b/src/plugins/gstreamer/mediaplayer/qgstreamerplayercontrol.cpp index ff99aa3ff..99c471b5c 100644 --- a/src/plugins/gstreamer/mediaplayer/qgstreamerplayercontrol.cpp +++ b/src/plugins/gstreamer/mediaplayer/qgstreamerplayercontrol.cpp @@ -371,7 +371,7 @@ void QGstreamerPlayerControl::setMedia(const QMediaContent &content, QIODevice * emit bufferStatusChanged(0); } - if (m_stream) { + if (m_stream && m_stream != stream) { if (m_ownStream) delete m_stream; m_stream = 0; |