summaryrefslogtreecommitdiff
path: root/src/multimedia
diff options
context:
space:
mode:
Diffstat (limited to 'src/multimedia')
-rw-r--r--src/multimedia/audio/qsoundeffect_pulse_p.cpp3
-rw-r--r--src/multimedia/video/qimagevideobuffer.cpp2
2 files changed, 3 insertions, 2 deletions
diff --git a/src/multimedia/audio/qsoundeffect_pulse_p.cpp b/src/multimedia/audio/qsoundeffect_pulse_p.cpp
index a86f22872..981d4c01f 100644
--- a/src/multimedia/audio/qsoundeffect_pulse_p.cpp
+++ b/src/multimedia/audio/qsoundeffect_pulse_p.cpp
@@ -369,7 +369,8 @@ QSoundEffectPrivate::QSoundEffectPrivate(QObject* parent):
pulseDaemon()->ref();
m_ref = new QSoundEffectRef(this);
- pa_sample_spec_init(&m_pulseSpec);
+ if (pulseDaemon()->context())
+ pa_sample_spec_init(&m_pulseSpec);
m_resources = QMediaResourcePolicy::createResourceSet<QMediaPlayerResourceSetInterface>();
Q_ASSERT(m_resources);
diff --git a/src/multimedia/video/qimagevideobuffer.cpp b/src/multimedia/video/qimagevideobuffer.cpp
index 59f708fed..f407e02d0 100644
--- a/src/multimedia/video/qimagevideobuffer.cpp
+++ b/src/multimedia/video/qimagevideobuffer.cpp
@@ -89,7 +89,7 @@ uchar *QImageVideoBuffer::map(MapMode mode, int *numBytes, int *bytesPerLine)
d->mapMode = mode;
if (numBytes)
- *numBytes = d->image.byteCount();
+ *numBytes = int(d->image.sizeInBytes());
if (bytesPerLine)
*bytesPerLine = d->image.bytesPerLine();