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

Merge dev into 5.5

Browse Source 
Change-Id: I715a549b4cc10220a6e3b48799fdc38865a9345e
This commit is contained in:
Oswald Buddenhagen
2015-02-24 11:02:24 +01:00
parent 8c73595c02 e7e34562fe
commit b35a55f215
55 changed files with 129348 additions and 30327 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/multimedia/video/qvideoprobe.cpp
View File

@@ -51,7 +51,7 @@
player->setVideoOutput(myVideoSurface);
player->setMedia(QUrl::fromLocalFile("observation.mp4"));
player->play(); // Start receving frames as they get presented to myVideoSurface
player->play(); // Start receiving frames as they get presented to myVideoSurface
\endcode
This same approach works with the QCamera object as well, to receive viewfinder or video

2
src/multimedia/video/qvideoprobe.h
View File

@@ -34,7 +34,7 @@
#ifndef QVIDEOPROBE_H
#define QVIDEOPROBE_H
#include <QObject>
#include <QtCore/QObject>
#include <QtMultimedia/qvideoframe.h>
QT_BEGIN_NAMESPACE