[Scummvm-cvs-logs] scummvm master -> a22f9bccf3624a0f9a085391edddeef47eaa8c5f
wjp
wjp at usecode.org
Wed Jul 9 11:14:01 CEST 2014
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
a22f9bccf3 VIDEO: Reduce BinkDecoder stack usage
Commit: a22f9bccf3624a0f9a085391edddeef47eaa8c5f
https://github.com/scummvm/scummvm/commit/a22f9bccf3624a0f9a085391edddeef47eaa8c5f
Author: Willem Jan Palenstijn (wjp at usecode.org)
Date: 2014-07-08T21:18:12+02:00
Commit Message:
VIDEO: Reduce BinkDecoder stack usage
See bug #6677.
Changed paths:
video/bink_decoder.cpp
diff --git a/video/bink_decoder.cpp b/video/bink_decoder.cpp
index be4dc54..a228377 100644
--- a/video/bink_decoder.cpp
+++ b/video/bink_decoder.cpp
@@ -108,20 +108,18 @@ bool BinkDecoder::loadStream(Common::SeekableReadStream *stream) {
uint32 audioTrackCount = _bink->readUint32LE();
if (audioTrackCount > 0) {
- _audioTracks.reserve(audioTrackCount);
+ _audioTracks.resize(audioTrackCount);
_bink->skip(4 * audioTrackCount);
// Reading audio track properties
for (uint32 i = 0; i < audioTrackCount; i++) {
- AudioInfo track;
+ AudioInfo &track = _audioTracks[i];
track.sampleRate = _bink->readUint16LE();
track.flags = _bink->readUint16LE();
- _audioTracks.push_back(track);
-
- initAudioTrack(_audioTracks[i]);
+ initAudioTrack(track);
}
_bink->skip(4 * audioTrackCount);
More information about the Scummvm-git-logs
mailing list