diff options
| author | Samuel Mira <samuel.mira@qt.io> | 2021-12-09 21:20:41 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-12-10 19:33:48 +0000 |
| commit | 1ee2cdc39f341fd1bc2b9bd216c4ed27b069bc64 (patch) | |
| tree | d30f3edf0e0b8771436fc78edf2e1e96f59fbae6 | |
| parent | 7d2a2b00791ce6673c2900663cc3edb8ae25b5f8 (diff) | |
| download | qtmultimedia-1ee2cdc39f341fd1bc2b9bd216c4ed27b069bc64.tar.gz | |
Fix tst_qvideoframe failure
The test was expecting for a null frame to return -1 on the starttime
and endtime. That was the behavior for a long time, so it was reverted.
Fixes: QTBUG-99093
Change-Id: Ide3143b772cea65d402ae5fe0f0886b876f93e73
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
(cherry picked from commit e9b56cf4d1a2bfb6bcaa00a208cb216b7b20d2e1)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/multimedia/video/qvideoframe.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/multimedia/video/qvideoframe.cpp b/src/multimedia/video/qvideoframe.cpp index f0d61c5d5..1620bb78a 100644 --- a/src/multimedia/video/qvideoframe.cpp +++ b/src/multimedia/video/qvideoframe.cpp @@ -658,7 +658,7 @@ quint64 QVideoFrame::textureHandle(int plane) const qint64 QVideoFrame::startTime() const { if (!d) - return 0; + return -1; return d->startTime; } @@ -684,7 +684,7 @@ void QVideoFrame::setStartTime(qint64 time) qint64 QVideoFrame::endTime() const { if (!d) - return 0; + return -1; return d->endTime; } |