diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-03-28 03:01:36 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-03-28 03:01:36 +0100 |
| commit | d0e0119251288c9c7224c5c6797a1377032aac2f (patch) | |
| tree | eb2fa404470833cf4b94847594d250dcf1ec01fc /src/plugins | |
| parent | 46ac981d28240f93af02e4459d9ce02f294c2ab8 (diff) | |
| parent | 2a888bc3fb72069e735faad42e8325f60a5d7412 (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15v5.15.0-beta3
Change-Id: I3a719b4e4ba75da1784fb2bc5d6c014b1e6c54ac
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/directshow/common/directshowmediatype.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/plugins/directshow/common/directshowmediatype.cpp b/src/plugins/directshow/common/directshowmediatype.cpp index 103f1ddc1..37106586a 100644 --- a/src/plugins/directshow/common/directshowmediatype.cpp +++ b/src/plugins/directshow/common/directshowmediatype.cpp @@ -294,6 +294,7 @@ int DirectShowMediaType::bytesPerLine(const QVideoSurfaceFormat &format) return format.frameWidth() * 4; // 24 bpp packed formats. case QVideoFrame::Format_RGB24: + case QVideoFrame::Format_BGR24: return PAD_TO_DWORD(format.frameWidth() * 3); // 16 bpp packed formats. case QVideoFrame::Format_RGB565: |