diff options
| author | Bastien Bouclet | 2017-09-24 06:21:54 +0200 |
|---|---|---|
| committer | GitHub | 2017-09-24 06:21:54 +0200 |
| commit | 25d66b2a08f6a1ad09c7ad7dc9db11ad3a4c76cf (patch) | |
| tree | 9b28c0382e0c7362e2d88e73b8e312f8a8bbbdd8 /audio | |
| parent | 75026dba8cb3a9870e1e8f35b2625410ff49a131 (diff) | |
| parent | be67f0d8bfb4148e014931cce63b52e84ed95ee6 (diff) | |
| download | scummvm-rg350-25d66b2a08f6a1ad09c7ad7dc9db11ad3a4c76cf.tar.gz scummvm-rg350-25d66b2a08f6a1ad09c7ad7dc9db11ad3a4c76cf.tar.bz2 scummvm-rg350-25d66b2a08f6a1ad09c7ad7dc9db11ad3a4c76cf.zip | |
Merge pull request #1027 from bgK/memstream-default-arg
COMMON: Remove the DisposeAfterUse default value from dynamic write memory streams constructors
Diffstat (limited to 'audio')
| -rw-r--r-- | audio/decoders/quicktime.cpp | 2 | ||||
| -rw-r--r-- | audio/midiparser_qt.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/audio/decoders/quicktime.cpp b/audio/decoders/quicktime.cpp index b8eccb664b..4b0d5e078f 100644 --- a/audio/decoders/quicktime.cpp +++ b/audio/decoders/quicktime.cpp @@ -344,7 +344,7 @@ bool QuickTimeAudioDecoder::QuickTimeAudioTrack::isOldDemuxing() const { AudioStream *QuickTimeAudioDecoder::QuickTimeAudioTrack::readAudioChunk(uint chunk) { AudioSampleDesc *entry = (AudioSampleDesc *)_parentTrack->sampleDescs[0]; - Common::MemoryWriteStreamDynamic *wStream = new Common::MemoryWriteStreamDynamic(); + Common::MemoryWriteStreamDynamic *wStream = new Common::MemoryWriteStreamDynamic(DisposeAfterUse::NO); _decoder->_fd->seek(_parentTrack->chunkOffsets[chunk]); diff --git a/audio/midiparser_qt.cpp b/audio/midiparser_qt.cpp index 3078be9186..8821dbfaa8 100644 --- a/audio/midiparser_qt.cpp +++ b/audio/midiparser_qt.cpp @@ -455,7 +455,7 @@ void MidiParser_QT::initCommon() { byte *MidiParser_QT::readWholeTrack(Common::QuickTimeParser::Track *track, uint32 &trackSize) { // This just goes through all chunks and appends them together - Common::MemoryWriteStreamDynamic output; + Common::MemoryWriteStreamDynamic output(DisposeAfterUse::NO); uint32 curSample = 0; // Read in the note request data first |