summaryrefslogtreecommitdiff
path: root/Source/3rdParty/SDL2/src/audio/SDL_audiocvt.c
diff options
context:
space:
mode:
authorchai <chaifix@163.com>2019-01-31 18:38:35 +0800
committerchai <chaifix@163.com>2019-01-31 18:38:35 +0800
commit2ec55fd974a63b705a4777c256d2222c874fa043 (patch)
tree48f1fea59ee9fc713a28a9aac3f05b98dc5ae66f /Source/3rdParty/SDL2/src/audio/SDL_audiocvt.c
parentc581dfbf1e849f393861d15e82aa6446c0c1c310 (diff)
*SDL project
Diffstat (limited to 'Source/3rdParty/SDL2/src/audio/SDL_audiocvt.c')
-rw-r--r--Source/3rdParty/SDL2/src/audio/SDL_audiocvt.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/3rdParty/SDL2/src/audio/SDL_audiocvt.c b/Source/3rdParty/SDL2/src/audio/SDL_audiocvt.c
index 7fde2b9..ee0ba32 100644
--- a/Source/3rdParty/SDL2/src/audio/SDL_audiocvt.c
+++ b/Source/3rdParty/SDL2/src/audio/SDL_audiocvt.c
@@ -724,7 +724,7 @@ SDL_ResampleCVT(SDL_AudioCVT *cvt, const int chans, const SDL_AudioFormat format
SDL_assert(format == AUDIO_F32SYS);
/* we keep no streaming state here, so pad with silence on both ends. */
- padding = (float *) SDL_calloc(paddingsamples, sizeof (float));
+ padding = (float *) SDL_calloc(paddingsamples ? paddingsamples : 1, sizeof (float));
if (!padding) {
SDL_OutOfMemory();
return;
@@ -1291,7 +1291,7 @@ SDL_NewAudioStream(const SDL_AudioFormat src_format,
retval->packetlen = packetlen;
retval->rate_incr = ((double) dst_rate) / ((double) src_rate);
retval->resampler_padding_samples = ResamplerPadding(retval->src_rate, retval->dst_rate) * pre_resample_channels;
- retval->resampler_padding = (float *) SDL_calloc(retval->resampler_padding_samples, sizeof (float));
+ retval->resampler_padding = (float *) SDL_calloc(retval->resampler_padding_samples ? retval->resampler_padding_samples : 1, sizeof (float));
if (retval->resampler_padding == NULL) {
SDL_FreeAudioStream(retval);