Minor cleanup in ffmpeg demuxer

Just use local reference avPacket instead of taking the pointer
from packet.

Change-Id: If173a49224cc53ae2f7269a203bdcb85ddfc259e
Reviewed-by: Lars Knoll <lars@knoll.priv.no>
(cherry picked from commit 153b3f345a3c804b3ff0b7a74a1130ed4fa7f562)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 8ecb599ab1ffd820d0714165e8a1e71fe549809a)

1 files changed, 11 insertions, 9 deletions

diff --git a/src/plugins/multimedia/ffmpeg/playbackengine/qffmpegdemuxer.cpp b/src/plugins/multimedia/ffmpeg/playbackengine/qffmpegdemuxer.cpp
index 3c5ea8e6b..e45e413cb 100644
--- a/src/plugins/multimedia/ffmpeg/playbackengine/qffmpegdemuxer.cpp
+++ b/src/plugins/multimedia/ffmpeg/playbackengine/qffmpegdemuxer.cpp
@@ -71,18 +71,19 @@ void Demuxer::doNextStep()
         return;
     }
 
-    const auto streamIndex = packet.avPacket()->stream_index;
+    auto &avPacket = *packet.avPacket();
+
+    const auto streamIndex = avPacket.stream_index;
     const auto stream = m_context->streams[streamIndex];
 
     auto it = m_streams.find(streamIndex);
 
     if (it != m_streams.end()) {
-        const auto packetEndPos =
-                streamTimeToUs(stream, packet.avPacket()->pts + packet.avPacket()->duration);
+        const auto packetEndPos = streamTimeToUs(stream, avPacket.pts + avPacket.duration);
         m_endPts = std::max(m_endPts, m_posWithOffset.offset.pos + packetEndPos);
 
-        it->second.bufferingTime += streamTimeToUs(stream, packet.avPacket()->duration);
-        it->second.bufferingSize += packet.avPacket()->size;
+        it->second.bufferingTime += streamTimeToUs(stream, avPacket.duration);
+        it->second.bufferingSize += avPacket.size;
 
         auto signal = signalByTrackType(it->second.trackType);
         emit (this->*signal)(packet);
@@ -98,13 +99,14 @@ void Demuxer::onPacketProcessed(Packet packet)
     if (packet.sourceId() != id())
         return;
 
-    const auto streamIndex = packet.avPacket()->stream_index;
+    auto &avPacket = *packet.avPacket();
+
+    const auto streamIndex = avPacket.stream_index;
     auto it = m_streams.find(streamIndex);
 
     if (it != m_streams.end()) {
-        it->second.bufferingTime -=
-                streamTimeToUs(m_context->streams[streamIndex], packet.avPacket()->duration);
-        it->second.bufferingSize -= packet.avPacket()->size;
+        it->second.bufferingTime -= streamTimeToUs(m_context->streams[streamIndex], avPacket.duration);
+        it->second.bufferingSize -= avPacket.size;
 
         Q_ASSERT(it->second.bufferingTime >= 0);
         Q_ASSERT(it->second.bufferingSize >= 0);