diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-02-24 11:02:24 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-02-24 11:02:25 +0100 |
| commit | b35a55f215bcf9298ceea5492da16b844507d202 (patch) | |
| tree | 303ddf3757fb56ac8352d9f1457c5956396a153a /src/multimedia/video | |
| parent | 8c73595c023d41ec832a34988116d380a08955f8 (diff) | |
| parent | e7e34562fe4264dd84e246aa5b12ad14d8eb9021 (diff) | |
Merge dev into 5.5
Change-Id: I715a549b4cc10220a6e3b48799fdc38865a9345e
Diffstat (limited to 'src/multimedia/video')
| -rw-r--r-- | src/multimedia/video/qvideoprobe.cpp | 2 | ||||
| -rw-r--r-- | src/multimedia/video/qvideoprobe.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/multimedia/video/qvideoprobe.cpp b/src/multimedia/video/qvideoprobe.cpp index 59b1a5433..87fabd026 100644 --- a/src/multimedia/video/qvideoprobe.cpp +++ b/src/multimedia/video/qvideoprobe.cpp @@ -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 diff --git a/src/multimedia/video/qvideoprobe.h b/src/multimedia/video/qvideoprobe.h index bc175428f..5de594f06 100644 --- a/src/multimedia/video/qvideoprobe.h +++ b/src/multimedia/video/qvideoprobe.h @@ -34,7 +34,7 @@ #ifndef QVIDEOPROBE_H #define QVIDEOPROBE_H -#include <QObject> +#include <QtCore/QObject> #include <QtMultimedia/qvideoframe.h> QT_BEGIN_NAMESPACE |