From 9a139f511f5937e5ad34e2765332857817a5502e Mon Sep 17 00:00:00 2001 From: Chris Robinson Date: Wed, 21 Mar 2012 15:29:05 -0700 Subject: [PATCH] Avoid redefining SOUND_IN --- apps/openmw/mwsound/soundmanager.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/apps/openmw/mwsound/soundmanager.cpp b/apps/openmw/mwsound/soundmanager.cpp index a46c17e79d..5a6b07e0a8 100644 --- a/apps/openmw/mwsound/soundmanager.cpp +++ b/apps/openmw/mwsound/soundmanager.cpp @@ -23,13 +23,17 @@ */ #ifdef OPENMW_USE_FFMPEG #include "ffmpeg_decoder.hpp" +#ifndef SOUND_IN #define SOUND_IN "FFmpeg" #endif +#endif #ifdef OPENMW_USE_MPG123 #include "mpgsnd_decoder.hpp" +#ifndef SOUND_IN #define SOUND_IN "mpg123,sndfile" #endif +#endif namespace MWSound