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 f9748bd6d86504239a7fe139bc9b63481f8ab4aa..4ed38a88b633fde65875389fb622340cc3d4b12a 100644 (file)
--- 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;