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/gstreamer | |
| 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/gstreamer')
| -rw-r--r-- | src/plugins/mediaservices/gstreamer/qvideosurfacegstsink.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/mediaservices/gstreamer/qvideosurfacegstsink.cpp b/src/plugins/mediaservices/gstreamer/qvideosurfacegstsink.cpp index a3c7157..9e3807b 100644 --- a/src/plugins/mediaservices/gstreamer/qvideosurfacegstsink.cpp +++ b/src/plugins/mediaservices/gstreamer/qvideosurfacegstsink.cpp @@ -273,8 +273,8 @@ static const RgbFormat qt_rgbColorLookup[] = { QVideoFrame::Format_BGR32 , 32, 24, 1234, 0x000000FF, 0x0000FF00, 0x00FF0000, 0x00000000 }, { QVideoFrame::Format_ARGB32, 32, 24, 4321, 0x0000FF00, 0x00FF0000, 0xFF000000, 0x000000FF }, { QVideoFrame::Format_ARGB32, 32, 24, 1234, 0x00FF0000, 0x0000FF00, 0x000000FF, 0xFF000000 }, - { QVideoFrame::Format_RGB24 , 24, 24, 4321, 0x000000FF, 0x0000FF00, 0x00FF0000, 0x00000000 }, - { QVideoFrame::Format_BGR24 , 24, 24, 4321, 0x00FF0000, 0x0000FF00, 0x000000FF, 0x00000000 }, + { QVideoFrame::Format_RGB24 , 24, 24, 4321, 0x00FF0000, 0x0000FF00, 0x000000FF, 0x00000000 }, + { QVideoFrame::Format_BGR24 , 24, 24, 4321, 0x000000FF, 0x0000FF00, 0x00FF0000, 0x00000000 }, { QVideoFrame::Format_RGB565, 16, 16, 1234, 0x0000F800, 0x000007E0, 0x0000001F, 0x00000000 } }; |