diff options
| author | Andrew den Exter <andrew.den-exter@nokia.com> | 2010-02-18 06:05:27 (GMT) |
|---|---|---|
| committer | Andrew den Exter <andrew.den-exter@nokia.com> | 2010-02-18 06:05:27 (GMT) |
| commit | 7c2ccecd96631caf290e070f9e34bbe54be275ce (patch) | |
| tree | 0d347e34c4537d203dd84e6a2fc3560c784099dc /src/plugins/mediaservices/directshow/mediaplayer/directshowmediatype.cpp | |
| parent | c166173cde49ad76bc8c6904df01af8cfe8eb401 (diff) | |
| download | Qt-7c2ccecd96631caf290e070f9e34bbe54be275ce.zip Qt-7c2ccecd96631caf290e070f9e34bbe54be275ce.tar.gz Qt-7c2ccecd96631caf290e070f9e34bbe54be275ce.tar.bz2 | |
Switch RGB24 and BGR24 shaders back.
This reverts a7f6af9817771b8211433c8cf24fe7150c5b7bf5. The original
relationship was consistent with QImage's RGB24, making the direct show
RGB24 format BGR24.
Diffstat (limited to 'src/plugins/mediaservices/directshow/mediaplayer/directshowmediatype.cpp')
| -rw-r--r-- | src/plugins/mediaservices/directshow/mediaplayer/directshowmediatype.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/mediaservices/directshow/mediaplayer/directshowmediatype.cpp b/src/plugins/mediaservices/directshow/mediaplayer/directshowmediatype.cpp index b60a903..f719b29 100644 --- a/src/plugins/mediaservices/directshow/mediaplayer/directshowmediatype.cpp +++ b/src/plugins/mediaservices/directshow/mediaplayer/directshowmediatype.cpp @@ -55,7 +55,7 @@ namespace static const TypeLookup qt_typeLookup[] = { { 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 }, |