Stop playback position update timer on end of stream

The timer is restarted on each "play"
It was not stopped just because of some merge troubles.
Also, extra headers have been removed

Pick-to: 6.5
Change-Id: I0ef41b62d977fef781c96bb93f6dc7cca4db97f9
Reviewed-by: Lars Knoll <lars@knoll.priv.no>

1 files changed, 1 insertions, 12 deletions

diff --git a/src/plugins/multimedia/ffmpeg/qffmpegmediaplayer.cpp b/src/plugins/multimedia/ffmpeg/qffmpegmediaplayer.cpp
index a3ea9170f..0041c9a43 100644
--- a/src/plugins/multimedia/ffmpeg/qffmpegmediaplayer.cpp
+++ b/src/plugins/multimedia/ffmpeg/qffmpegmediaplayer.cpp
@@ -2,25 +2,13 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
 #include "qffmpegmediaplayer_p.h"
-#include "qffmpegmediaformatinfo_p.h"
-#include "qlocale.h"
-#include "qffmpeg_p.h"
-#include "qffmpegmediametadata_p.h"
-#include "qffmpegvideobuffer_p.h"
 #include "private/qplatformaudiooutput_p.h"
 #include "qvideosink.h"
-#include "qaudiosink.h"
 #include "qaudiooutput.h"
 
 #include "qffmpegplaybackengine_p.h"
 
-#include <qlocale.h>
-#include <qthread.h>
-#include <qatomic.h>
-#include <qwaitcondition.h>
-#include <qmutex.h>
 #include <qtimer.h>
-#include <qqueue.h>
 
 #include <qloggingcategory.h>
 
@@ -60,6 +48,7 @@ void QFFmpegMediaPlayer::updatePosition()
 
 void QFFmpegMediaPlayer::endOfStream()
 {
+    positionUpdateTimer.stop();
     positionChanged(duration());
     stateChanged(QMediaPlayer::StoppedState);
     mediaStatusChanged(QMediaPlayer::EndOfMedia);