diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-03-18 11:54:43 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-03-18 11:54:44 +0100 |
| commit | 8ef57db9729b714239ad507488e1c8a011a5163a (patch) | |
| tree | b3a9ff7629762707c05221b34f9372437604608f /src/plugins/directshow | |
| parent | 69837e6e04ae125186a8deaac59d82607fcd6d1a (diff) | |
| parent | cd6a109f6068ea74270cb47736b3e2259e4ace84 (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: Ia1bc95c071d29653a85e753964d15826ce3706f8
Diffstat (limited to 'src/plugins/directshow')
| -rw-r--r-- | src/plugins/directshow/player/directshowioreader.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/directshow/player/directshowioreader.cpp b/src/plugins/directshow/player/directshowioreader.cpp index ced10ea10..3318d57b5 100644 --- a/src/plugins/directshow/player/directshowioreader.cpp +++ b/src/plugins/directshow/player/directshowioreader.cpp @@ -155,7 +155,7 @@ HRESULT DirectShowIOReader::Request(IMediaSample *pSample, DWORD_PTR dwUser) return VFW_E_SAMPLE_TIME_NOT_SET; } LONGLONG position = startTime / 10000000; - LONG length = (endTime - startTime) / 10000000; + LONG length = qMin<qint64>((endTime - startTime) / 10000000, m_availableLength); auto request = new DirectShowSampleRequest(pSample, dwUser, position, length, buffer); |