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

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

Browse Source 
Conflicts:
	.qmake.conf

Change-Id: Iecd8d7b94e52a8981526b12cffa40e99870ba62f
This commit is contained in:
Sergio Ahumada
2014-06-14 21:59:24 +02:00
parent d415d3256d 150ff6662d
commit d691f5ca2b
168 changed files with 2725 additions and 2694 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -55,20 +55,15 @@
QT_BEGIN_NAMESPACE
namespace
static void qRegisterVideoFrameMetaTypes()
{
class QVideoFramePrivateRegisterMetaTypes
{
public:
QVideoFramePrivateRegisterMetaTypes()
{
qRegisterMetaType<QVideoFrame>();
qRegisterMetaType<QVideoFrame::FieldType>();
qRegisterMetaType<QVideoFrame::PixelFormat>();
}
} _registerMetaTypes;
qRegisterMetaType<QVideoFrame>();
qRegisterMetaType<QVideoFrame::FieldType>();
qRegisterMetaType<QVideoFrame::PixelFormat>();
}
Q_CONSTRUCTOR_FUNCTION(qRegisterVideoFrameMetaTypes)
class QVideoFramePrivate : public QSharedData
{