diff options
| author | axis <qt-info@nokia.com> | 2009-11-06 14:50:21 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2009-11-06 14:50:21 (GMT) |
| commit | d1aa89647824cbaf9af4fc943d4514018973ddc1 (patch) | |
| tree | e8e13c32613a896311117fc39c45fe8b6f27144d /src/multimedia/video/qvideoframe.h | |
| parent | 351ba8b9ca4f0db176c9e3553d105be0ef35c844 (diff) | |
| parent | daf5f511ee813fc4fffba64bed558d0413270388 (diff) | |
| download | Qt-d1aa89647824cbaf9af4fc943d4514018973ddc1.zip Qt-d1aa89647824cbaf9af4fc943d4514018973ddc1.tar.gz Qt-d1aa89647824cbaf9af4fc943d4514018973ddc1.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt
Diffstat (limited to 'src/multimedia/video/qvideoframe.h')
| -rw-r--r-- | src/multimedia/video/qvideoframe.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/multimedia/video/qvideoframe.h b/src/multimedia/video/qvideoframe.h index e1b46a8..d08008b 100644 --- a/src/multimedia/video/qvideoframe.h +++ b/src/multimedia/video/qvideoframe.h @@ -141,7 +141,7 @@ public: uchar *bits(); const uchar *bits() const; - int numBytes() const; + int mappedBytes() const; QVariant handle() const; @@ -151,8 +151,8 @@ public: qint64 endTime() const; void setEndTime(qint64 time); - static PixelFormat equivalentPixelFormat(QImage::Format format); - static QImage::Format equivalentImageFormat(PixelFormat format); + static PixelFormat pixelFormatFromImageFormat(QImage::Format format); + static QImage::Format imageFormatFromPixelFormat(PixelFormat format); private: QExplicitlySharedDataPointer<QVideoFramePrivate> d; |