diff options
| author | Kurt Korbatits <kurt.korbatits@nokia.com> | 2009-11-10 03:01:07 (GMT) |
|---|---|---|
| committer | Kurt Korbatits <kurt.korbatits@nokia.com> | 2009-11-10 03:01:07 (GMT) |
| commit | 8df98549a4d84b5877e50318140c2041e17632fb (patch) | |
| tree | 0c55d5ef4d8380ec45c6457a40b033dc45cbd579 /src/multimedia | |
| parent | f55c317e377aaf0b3e24904e88dc1c4a6e15a20a (diff) | |
| parent | 9a6de1fa0db0da8c4fa5eb904ef6d78cc619e332 (diff) | |
| download | Qt-8df98549a4d84b5877e50318140c2041e17632fb.zip Qt-8df98549a4d84b5877e50318140c2041e17632fb.tar.gz Qt-8df98549a4d84b5877e50318140c2041e17632fb.tar.bz2 | |
Merge branch '4.6' of ../qt into 4.6
Diffstat (limited to 'src/multimedia')
| -rw-r--r-- | src/multimedia/video/qimagevideobuffer.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/multimedia/video/qimagevideobuffer.cpp b/src/multimedia/video/qimagevideobuffer.cpp index bfeb2a0..e57adb6 100644 --- a/src/multimedia/video/qimagevideobuffer.cpp +++ b/src/multimedia/video/qimagevideobuffer.cpp @@ -85,7 +85,7 @@ uchar *QImageVideoBuffer::map(MapMode mode, int *numBytes, int *bytesPerLine) d->mapMode = mode; if (numBytes) - *numBytes = d->image.numBytes(); + *numBytes = d->image.byteCount(); if (bytesPerLine) *bytesPerLine = d->image.bytesPerLine(); |