diff options
| author | Filippos Karapetis | 2008-09-03 10:10:45 +0000 |
|---|---|---|
| committer | Filippos Karapetis | 2008-09-03 10:10:45 +0000 |
| commit | 2d36c08d9faf71a6725f73d1f7ff77070e74f0a2 (patch) | |
| tree | 5f95019a2747257e6e28b46369fa5cabd3e1defa | |
| parent | 4019bb3e37fff4f424eec2f2b89be8b1522cbc5a (diff) | |
| download | scummvm-rg350-2d36c08d9faf71a6725f73d1f7ff77070e74f0a2.tar.gz scummvm-rg350-2d36c08d9faf71a6725f73d1f7ff77070e74f0a2.tar.bz2 scummvm-rg350-2d36c08d9faf71a6725f73d1f7ff77070e74f0a2.zip | |
Fix for MSVC warning about ambiguous usage of MIN
svn-id: r34299
| -rw-r--r-- | sound/flac.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/flac.cpp b/sound/flac.cpp index f058d2dc6f..da8460eebc 100644 --- a/sound/flac.cpp +++ b/sound/flac.cpp @@ -149,7 +149,7 @@ public: bool isStreamDecoderReady() const { return getStreamDecoderState() == FLAC__STREAM_DECODER_SEARCH_FOR_FRAME_SYNC ; } protected: - uint getChannels() const { return MIN(_streaminfo.channels, MAX_OUTPUT_CHANNELS); } + uint getChannels() const { return MIN<uint>(_streaminfo.channels, MAX_OUTPUT_CHANNELS); } bool allocateBuffer(uint minSamples); |