diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-07-16 03:04:23 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-07-16 03:04:23 +0200 |
| commit | f93818a2d1b59f240d73d47c0771284a01c5a87a (patch) | |
| tree | 6fd00c5cc077a46e635aabe68dc77065893aab71 /src/plugins/directshow/common | |
| parent | 10c080521c525e1729b23dfa0afd08a1428f40d0 (diff) | |
| parent | d035d4de3770427396bd4e6a7db9b6c7161e2abf (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Change-Id: I7ca7fb6143ec296c16a37a7be236470dbd1742a7
Diffstat (limited to 'src/plugins/directshow/common')
| -rw-r--r-- | src/plugins/directshow/common/directshowmediatype.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/directshow/common/directshowmediatype.cpp b/src/plugins/directshow/common/directshowmediatype.cpp index fe86e0204..103f1ddc1 100644 --- a/src/plugins/directshow/common/directshowmediatype.cpp +++ b/src/plugins/directshow/common/directshowmediatype.cpp @@ -52,7 +52,7 @@ namespace { { QVideoFrame::Format_ARGB32, MEDIASUBTYPE_ARGB32 }, { QVideoFrame::Format_RGB32, MEDIASUBTYPE_RGB32 }, - { QVideoFrame::Format_RGB24, MEDIASUBTYPE_RGB24 }, + { QVideoFrame::Format_BGR24, MEDIASUBTYPE_RGB24 }, { QVideoFrame::Format_RGB565, MEDIASUBTYPE_RGB565 }, { QVideoFrame::Format_RGB555, MEDIASUBTYPE_RGB555 }, { QVideoFrame::Format_AYUV444, MEDIASUBTYPE_AYUV }, |