From 38a4d9a6c5f312fc37418c21b416cc3f8c379205 Mon Sep 17 00:00:00 2001 From: Chris Robinson Date: Tue, 16 Aug 2011 18:53:04 -0700 Subject: Get rid of the remaining min/max usage --- Alc/mixer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Alc/mixer.c') diff --git a/Alc/mixer.c b/Alc/mixer.c index b589593f..a4197341 100644 --- a/Alc/mixer.c +++ b/Alc/mixer.c @@ -592,7 +592,7 @@ ALvoid MixSource(ALsource *Source, ALCdevice *Device, ALuint SamplesToDo) DataSize64 += BufferPadding+BufferPrePadding; DataSize64 *= FrameSize; - BufferSize = min(DataSize64, STACK_DATA_SIZE); + BufferSize = ((DataSize64 > STACK_DATA_SIZE) ? STACK_DATA_SIZE : DataSize64); BufferSize -= BufferSize%FrameSize; if(Source->lSourceType == AL_STATIC) -- cgit v1.2.3