diff options
| author | Mikko Hallamaa <mikko.hallamaa@qt.io> | 2024-03-08 16:30:11 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2024-03-14 18:42:05 +0000 |
| commit | 7f7016ec6aec2cd2d5d6333fbd8573d2fb9b62e1 (patch) | |
| tree | a6b2fdc98604f2d5b1dd6a01797de5175d82520f | |
| parent | 7137584ab3d4a67d0b6a507a65e1889342ba5b7c (diff) | |
FFmpeg: Remove a false positive assertion from demuxer constructor
FFmpeg demuxer constructor assumed that the current loop index is less
than total loop count. This overlooked the fact that the demuxer is
recreated when seeking, which caused the assertion to fail for example
when the loop counter was reset to 1 before seeking.
This patch removes this assertion from the constructor.
Fixes: QTBUG-123117
Pick-to: 6.5
Change-Id: If7b4c367fb549540fb55cb50de10d70acdd0009d
Reviewed-by: Artem Dyomin <artem.dyomin@qt.io>
Reviewed-by: Jøger Hansegård <joger.hansegard@qt.io>
(cherry picked from commit eff9ffa5c1c90fa2bac8dcfd0acdf0b9cac97530)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 37208308052211a589480622f56f9cca61ff8d51)
| -rw-r--r-- | src/plugins/multimedia/ffmpeg/playbackengine/qffmpegdemuxer.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/plugins/multimedia/ffmpeg/playbackengine/qffmpegdemuxer.cpp b/src/plugins/multimedia/ffmpeg/playbackengine/qffmpegdemuxer.cpp index 5016fb6ef..8cced835c 100644 --- a/src/plugins/multimedia/ffmpeg/playbackengine/qffmpegdemuxer.cpp +++ b/src/plugins/multimedia/ffmpeg/playbackengine/qffmpegdemuxer.cpp @@ -39,7 +39,6 @@ Demuxer::Demuxer(AVFormatContext *context, const PositionWithOffset &posWithOffs << "loop index:" << posWithOffset.offset.index << "loops:" << loops; Q_ASSERT(m_context); - Q_ASSERT(loops < 0 || m_posWithOffset.offset.index < loops); for (auto i = 0; i < QPlatformMediaPlayer::NTrackTypes; ++i) { if (streamIndexes[i] >= 0) { |