Merge branch 'dev' of git://code.qt.io/qt/qtmultimedia into wip/qt6

Change-Id: I91e8d902cd916ee16a2495da9bf40a34c6bc05d2

1 files changed, 3 insertions, 13 deletions

diff --git a/src/plugins/directshow/player/directshowplayercontrol.cpp b/src/plugins/directshow/player/directshowplayercontrol.cpp
index 2d0ee2d59..7e1413b56 100644
--- a/src/plugins/directshow/player/directshowplayercontrol.cpp
+++ b/src/plugins/directshow/player/directshowplayercontrol.cpp
@@ -50,19 +50,6 @@
 DirectShowPlayerControl::DirectShowPlayerControl(DirectShowPlayerService *service, QObject *parent)
     : QMediaPlayerControl(parent)
     , m_service(service)
-    , m_audio(0)
-    , m_updateProperties(0)
-    , m_state(QMediaPlayer::StoppedState)
-    , m_status(QMediaPlayer::NoMedia)
-    , m_error(QMediaPlayer::NoError)
-    , m_streamTypes(0)
-    , m_volume(100)
-    , m_muted(false)
-    , m_emitPosition(-1)
-    , m_pendingPosition(-1)
-    , m_duration(0)
-    , m_playbackRate(0)
-    , m_seekable(false)
 {
 }
 
@@ -219,6 +206,9 @@ const QIODevice *DirectShowPlayerControl::mediaStream() const
 
 void DirectShowPlayerControl::setMedia(const QMediaContent &media, QIODevice *stream)
 {
+    if (m_media == media)
+        return;
+
     m_pendingPosition = -1;
     m_emitPosition = -1;