diff options
| author | Chris Robinson <[email protected]> | 2011-08-16 18:53:04 -0700 |
|---|---|---|
| committer | Chris Robinson <[email protected]> | 2011-08-16 18:53:04 -0700 |
| commit | 38a4d9a6c5f312fc37418c21b416cc3f8c379205 (patch) | |
| tree | 9772304fd9e55b2b6d5805b86d3cb74711bc3878 /Alc/mixer.c | |
| parent | 9f5bf5f9307e86c28ff19a61d422c7b2fe389fdc (diff) | |
Get rid of the remaining min/max usage
Diffstat (limited to 'Alc/mixer.c')
| -rw-r--r-- | Alc/mixer.c | 2 |
1 files changed, 1 insertions, 1 deletions
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) |