[Scummvm-cvs-logs] scummvm master -> f0091af6b514938be8778d4c6943b18c81b3d50a

clone2727 clone2727 at gmail.com
Wed Oct 3 16:46:44 CEST 2012


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:
f0091af6b5 AUDIO: Don't allow skipping negative times in skipSamples()


Commit: f0091af6b514938be8778d4c6943b18c81b3d50a
    https://github.com/scummvm/scummvm/commit/f0091af6b514938be8778d4c6943b18c81b3d50a
Author: Matthew Hoops (clone2727 at gmail.com)
Date: 2012-10-03T07:45:43-07:00

Commit Message:
AUDIO: Don't allow skipping negative times in skipSamples()

Changed paths:
    audio/decoders/quicktime.cpp



diff --git a/audio/decoders/quicktime.cpp b/audio/decoders/quicktime.cpp
index 35210eb..0588650 100644
--- a/audio/decoders/quicktime.cpp
+++ b/audio/decoders/quicktime.cpp
@@ -395,9 +395,9 @@ AudioStream *QuickTimeAudioDecoder::QuickTimeAudioTrack::readAudioChunk(uint chu
 }
 
 void QuickTimeAudioDecoder::QuickTimeAudioTrack::skipSamples(const Timestamp &length, AudioStream *stream) {
-	uint32 sampleCount = length.convertToFramerate(getRate()).totalNumberOfFrames();
+	int32 sampleCount = length.convertToFramerate(getRate()).totalNumberOfFrames();
 
-	if (sampleCount == 0)
+	if (sampleCount <= 0)
 		return;
 
 	if (isStereo())






More information about the Scummvm-git-logs mailing list