Merge PR 'Add a third masterextra and default it to dpm.dpmaster.org'

[xonotic/darkplaces.git] / snd_mix.c

diff --git a/snd_mix.c b/snd_mix.c
index f9748bd6d86504239a7fe139bc9b63481f8ab4aa..736d6ea1964f54ab7d11485daafde3d5d498f039 100644 (file)
--- a/snd_mix.c
+++ b/snd_mix.c
@@ -24,11 +24,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 extern cvar_t snd_softclip;
 
 static portable_sampleframe_t paintbuffer[PAINTBUFFER_SIZE];
-static portable_sampleframe_t paintbuffer_unswapped[PAINTBUFFER_SIZE];
 
 extern speakerlayout_t snd_speakerlayout; // for querying the listeners
 
 #ifdef CONFIG_VIDEO_CAPTURE
+static portable_sampleframe_t paintbuffer_unswapped[PAINTBUFFER_SIZE];
+
 static void S_CaptureAVISound(const portable_sampleframe_t *sampleframes, size_t length)
 {
        size_t i;
@@ -346,8 +347,8 @@ void S_MixToBuffer(void *stream, unsigned int bufferframes)
        double posd;
        double speedd;
        float maxvol;
-       qboolean looping;
-       qboolean silent;
+       qbool looping;
+       qbool silent;
 
        // mix as many times as needed to fill the requested buffer
        while (bufferframes)