From: motorsep <motorsep@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Sun, 26 May 2019 22:05:03 +0000 (+0000)
Subject: UNMERGE! + Compiling fix
X-Git-Tag: xonotic-v0.8.5~6
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=652d41d0118606aa318d3c686cb075787103c7d3;p=xonotic%2Fdarkplaces.git

UNMERGE! + Compiling fix

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12477 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::unmerge=26e5b80cd0a43345efe839789be857f31db1bdc1
---

diff --git a/snd_mix.c b/snd_mix.c
index f9748bd6..4ed38a88 100644
--- a/snd_mix.c
+++ b/snd_mix.c
@@ -128,7 +128,6 @@ static void S_SoftClipPaintBuffer(portable_sampleframe_t *painted_ptr, int nbfra
 static void S_ConvertPaintBuffer(portable_sampleframe_t *painted_ptr, void *rb_ptr, int nbframes, int width, int nchannels)
 {
 	int i;
-	float val;
 	if (width == 4)  // 32bit float
 	{
 		float *snd_out = (float*)rb_ptr;