From d6ae9c49f76e1617704eed3bbb1069292949e16c Mon Sep 17 00:00:00 2001
From: Simon Howard
Date: Sun, 20 May 2007 15:06:46 +0000
Subject: Fix crash when converting audio down to a lower sample rate.

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 883
---
 src/Makefile.am | 2 +-
 src/i_sound.c   | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/Makefile.am b/src/Makefile.am
index 60370280..db446819 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -101,7 +101,7 @@ v_video.c            v_video.h             \
 wi_stuff.c           wi_stuff.h            \
 w_checksum.c         w_checksum.h          \
 w_wad.c              w_wad.h               \
-z_zone.c             z_zone.h   
+z_native.c           z_zone.h   
 
 # source files needed for FEATURE_DEHACKED
 
diff --git a/src/i_sound.c b/src/i_sound.c
index cc8f0bb5..a6e5995f 100644
--- a/src/i_sound.c
+++ b/src/i_sound.c
@@ -132,7 +132,8 @@ static void ExpandSoundData(byte *data,
 {
     SDL_AudioCVT convertor;
     
-    if (ConvertibleRatio(samplerate, mixer_freq)
+    if (samplerate <= mixer_freq
+     && ConvertibleRatio(samplerate, mixer_freq)
      && SDL_BuildAudioCVT(&convertor,
                           AUDIO_U8, 1, samplerate,
                           mixer_format, mixer_channels, mixer_freq))
-- 
cgit v1.2.3