From 2d36c08d9faf71a6725f73d1f7ff77070e74f0a2 Mon Sep 17 00:00:00 2001 From: Filippos Karapetis Date: Wed, 3 Sep 2008 10:10:45 +0000 Subject: Fix for MSVC warning about ambiguous usage of MIN svn-id: r34299 --- sound/flac.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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(_streaminfo.channels, MAX_OUTPUT_CHANNELS); } bool allocateBuffer(uint minSamples); -- cgit v1.2.3