diff options
| author | Andrew den Exter <andrew.den-exter@nokia.com> | 2010-06-23 08:39:17 (GMT) |
|---|---|---|
| committer | Andrew den Exter <andrew.den-exter@nokia.com> | 2010-06-23 08:39:17 (GMT) |
| commit | 66da996c11d2f630255650e6e88fc1a08a393b27 (patch) | |
| tree | c1687158788b81ab4242c1579ac03cecb7495a2c /src/multimedia/video | |
| parent | 65b05e330640a5e1920c61a4735cbc27a5ca3fe2 (diff) | |
| download | Qt-66da996c11d2f630255650e6e88fc1a08a393b27.zip Qt-66da996c11d2f630255650e6e88fc1a08a393b27.tar.gz Qt-66da996c11d2f630255650e6e88fc1a08a393b27.tar.bz2 | |
Fix missing QImage::Format to QVideoFrame::PixelFormat conversion.
This resulted in the the video widget example not being able to play
some gif files.
Task-number: MOBILITY-1137 MOBILITY-1138
Reviewed-by: Justin McPherson
Diffstat (limited to 'src/multimedia/video')
| -rw-r--r-- | src/multimedia/video/qvideoframe.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/multimedia/video/qvideoframe.cpp b/src/multimedia/video/qvideoframe.cpp index 2d66d9e..cd38f5e 100644 --- a/src/multimedia/video/qvideoframe.cpp +++ b/src/multimedia/video/qvideoframe.cpp @@ -665,6 +665,7 @@ QVideoFrame::PixelFormat QVideoFrame::pixelFormatFromImageFormat(QImage::Format case QImage::Format_RGB16: return Format_RGB565; case QImage::Format_ARGB8565_Premultiplied: + return Format_ARGB8565_Premultiplied; case QImage::Format_RGB666: case QImage::Format_ARGB6666_Premultiplied: return Format_Invalid; |