diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-16 08:22:18 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-16 08:22:18 (GMT) |
| commit | 7ce5bbd749f13117b5357571d4525b2e78f3310d (patch) | |
| tree | 7ef3e2fe2188720969785bb0b4d02145e6606c56 | |
| parent | 8d8566d061e26f18e1bde1255fdc1375035c8eaa (diff) | |
| parent | 6771ce532f8b61499c998a502ea8c73e8e42262b (diff) | |
| download | Qt-7ce5bbd749f13117b5357571d4525b2e78f3310d.zip Qt-7ce5bbd749f13117b5357571d4525b2e78f3310d.tar.gz Qt-7ce5bbd749f13117b5357571d4525b2e78f3310d.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging:
Added a QPixmap based QAbstractVideoBuffer HandleType.
| -rw-r--r-- | src/multimedia/video/qabstractvideobuffer.cpp | 1 | ||||
| -rw-r--r-- | src/multimedia/video/qabstractvideobuffer.h | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/src/multimedia/video/qabstractvideobuffer.cpp b/src/multimedia/video/qabstractvideobuffer.cpp index e9d30d0..db05ee5 100644 --- a/src/multimedia/video/qabstractvideobuffer.cpp +++ b/src/multimedia/video/qabstractvideobuffer.cpp @@ -73,6 +73,7 @@ QT_BEGIN_NAMESPACE \value GLTextureHandle The handle of the buffer is an OpenGL texture ID. \value XvShmImageHandle The handle contains pointer to shared memory XVideo image. \value CoreImageHandle The handle contains pointer to Mac OS X CIImage. + \value QPixmapHandle The handle of the buffer is a QPixmap. \value UserHandle Start value for user defined handle types. \sa handleType() diff --git a/src/multimedia/video/qabstractvideobuffer.h b/src/multimedia/video/qabstractvideobuffer.h index a8389db..98e12da 100644 --- a/src/multimedia/video/qabstractvideobuffer.h +++ b/src/multimedia/video/qabstractvideobuffer.h @@ -63,6 +63,7 @@ public: GLTextureHandle, XvShmImageHandle, CoreImageHandle, + QPixmapHandle, UserHandle = 1000 }; |