diff options
Diffstat (limited to 'apps/plugins/sdl/src/audio')
-rw-r--r-- | apps/plugins/sdl/src/audio/SDL_wave.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/apps/plugins/sdl/src/audio/SDL_wave.c b/apps/plugins/sdl/src/audio/SDL_wave.c index b4ad6c7876..21a7260be3 100644 --- a/apps/plugins/sdl/src/audio/SDL_wave.c +++ b/apps/plugins/sdl/src/audio/SDL_wave.c | |||
@@ -125,7 +125,7 @@ static int MS_ADPCM_decode(Uint8 **audio_buf, Uint32 *audio_len) | |||
125 | encoded_len = *audio_len; | 125 | encoded_len = *audio_len; |
126 | encoded = *audio_buf; | 126 | encoded = *audio_buf; |
127 | freeable = *audio_buf; | 127 | freeable = *audio_buf; |
128 | *audio_len = (encoded_len/MS_ADPCM_state.wavefmt.blockalign) * | 128 | *audio_len = (encoded_len/MS_ADPCM_state.wavefmt.blockalign) * |
129 | MS_ADPCM_state.wSamplesPerBlock* | 129 | MS_ADPCM_state.wSamplesPerBlock* |
130 | MS_ADPCM_state.wavefmt.channels*sizeof(Sint16); | 130 | MS_ADPCM_state.wavefmt.channels*sizeof(Sint16); |
131 | *audio_buf = (Uint8 *)SDL_malloc(*audio_len); | 131 | *audio_buf = (Uint8 *)SDL_malloc(*audio_len); |
@@ -340,7 +340,7 @@ static int IMA_ADPCM_decode(Uint8 **audio_buf, Uint32 *audio_len) | |||
340 | encoded_len = *audio_len; | 340 | encoded_len = *audio_len; |
341 | encoded = *audio_buf; | 341 | encoded = *audio_buf; |
342 | freeable = *audio_buf; | 342 | freeable = *audio_buf; |
343 | *audio_len = (encoded_len/IMA_ADPCM_state.wavefmt.blockalign) * | 343 | *audio_len = (encoded_len/IMA_ADPCM_state.wavefmt.blockalign) * |
344 | IMA_ADPCM_state.wSamplesPerBlock* | 344 | IMA_ADPCM_state.wSamplesPerBlock* |
345 | IMA_ADPCM_state.wavefmt.channels*sizeof(Sint16); | 345 | IMA_ADPCM_state.wavefmt.channels*sizeof(Sint16); |
346 | *audio_buf = (Uint8 *)SDL_malloc(*audio_len); | 346 | *audio_buf = (Uint8 *)SDL_malloc(*audio_len); |
@@ -413,7 +413,9 @@ SDL_AudioSpec * SDL_LoadWAV_RW (SDL_RWops *src, int freesrc, | |||
413 | was_error = 1; | 413 | was_error = 1; |
414 | goto done; | 414 | goto done; |
415 | } | 415 | } |
416 | 416 | chunk.data = NULL; | |
417 | chunk.length = 0; | ||
418 | |||
417 | /* Check the magic header */ | 419 | /* Check the magic header */ |
418 | RIFFchunk = SDL_ReadLE32(src); | 420 | RIFFchunk = SDL_ReadLE32(src); |
419 | wavelen = SDL_ReadLE32(src); | 421 | wavelen = SDL_ReadLE32(src); |
@@ -432,7 +434,6 @@ SDL_AudioSpec * SDL_LoadWAV_RW (SDL_RWops *src, int freesrc, | |||
432 | headerDiff += sizeof(Uint32); /* for WAVE */ | 434 | headerDiff += sizeof(Uint32); /* for WAVE */ |
433 | 435 | ||
434 | /* Read the audio data format chunk */ | 436 | /* Read the audio data format chunk */ |
435 | chunk.data = NULL; | ||
436 | do { | 437 | do { |
437 | if ( chunk.data != NULL ) { | 438 | if ( chunk.data != NULL ) { |
438 | SDL_free(chunk.data); | 439 | SDL_free(chunk.data); |