diff --git a/libretro-common/audio/audio_mixer.c b/libretro-common/audio/audio_mixer.c index 74c494c1dc..92ac70c29f 100644 --- a/libretro-common/audio/audio_mixer.c +++ b/libretro-common/audio/audio_mixer.c @@ -328,14 +328,21 @@ audio_mixer_sound_t* audio_mixer_load_wav(void *buffer, int32_t size) #ifdef HAVE_RWAV /* WAV data */ rwav_t wav; + enum rwav_state rwav_ret; /* WAV samples converted to float */ float* pcm = NULL; size_t samples = 0; /* Result */ audio_mixer_sound_t* sound = NULL; - enum rwav_state rwav_ret = rwav_load(&wav, buffer, size); - if (rwav_ret != RWAV_ITERATE_DONE) + wav.bitspersample = 0; + wav.numchannels = 0; + wav.samplerate = 0; + wav.numsamples = 0; + wav.subchunk2size = 0; + wav.samples = NULL; + + if ((rwav_ret = rwav_load(&wav, buffer, size)) != RWAV_ITERATE_DONE) return NULL; samples = wav.numsamples * 2; diff --git a/retroarch.c b/retroarch.c index cf0ad57674..59058c90d9 100644 --- a/retroarch.c +++ b/retroarch.c @@ -35920,8 +35920,10 @@ bool retroarch_main_init(int argc, char *argv[]) struct rarch_state *p_rarch = &rarch_st; settings_t *settings = p_rarch->configuration_settings; global_t *global = &p_rarch->g_extern; +#ifdef HAVE_ACCESSIBILITY bool accessibility_enable = false; unsigned accessibility_narrator_speech_speed = 0; +#endif p_rarch->osk_idx = OSK_LOWERCASE_LATIN; p_rarch->video_driver_active = true;