diff options
| author | Joerg Bornemann <joerg.bornemann@nokia.com> | 2009-11-11 11:25:03 (GMT) |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@nokia.com> | 2009-11-11 11:25:03 (GMT) |
| commit | b111d0bb1f0483d507c758810a0f247cb8dd82c0 (patch) | |
| tree | 9db9a693360c607a53d1ec8c3c421b338fb53fef /src/multimedia/video/qimagevideobuffer.cpp | |
| parent | 3e2c214dc217ac677733e2a56ac9f17ff0c3196f (diff) | |
| parent | 95db13345cd7b6b7cac8725fe2879aaf80233818 (diff) | |
| download | Qt-b111d0bb1f0483d507c758810a0f247cb8dd82c0.zip Qt-b111d0bb1f0483d507c758810a0f247cb8dd82c0.tar.gz Qt-b111d0bb1f0483d507c758810a0f247cb8dd82c0.tar.bz2 | |
Merge commit 'origin/4.6' into 4.6-ce
Diffstat (limited to 'src/multimedia/video/qimagevideobuffer.cpp')
| -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(); |