slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'origin/5.4' into dev

Browse Source 
Conflicts:
	.qmake.conf
	src/plugins/gstreamer/camerabin/camerabinsession.cpp

Change-Id: I66a6f3efc5391013934b6b321073c31f25e1de26
This commit is contained in:
Yoann Lopes
2015-01-19 14:35:33 +01:00
parent 9a215d954b 4ab105b89e
commit af2d5a181c
16 changed files with 119 additions and 358 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/multimedia/video/qvideoframe.cpp
View File

@@ -902,10 +902,13 @@ QVideoFrame::PixelFormat QVideoFrame::pixelFormatFromImageFormat(QImage::Format
{
switch (format) {
case QImage::Format_RGB32:
case QImage::Format_RGBX8888:
return Format_RGB32;
case QImage::Format_ARGB32:
case QImage::Format_RGBA8888:
return Format_ARGB32;
case QImage::Format_ARGB32_Premultiplied:
case QImage::Format_RGBA8888_Premultiplied:
return Format_ARGB32_Premultiplied;
case QImage::Format_RGB16:
return Format_RGB565;