From 9d9395d78fce46f91850427071c5450783fbb6d6 Mon Sep 17 00:00:00 2001 From: David Reid Date: Wed, 4 Aug 2021 22:22:19 +1000 Subject: [PATCH] Fix some warnings with ma_libopus and ma_libvorbis. --- extras/miniaudio_libopus.h | 4 ++-- extras/miniaudio_libvorbis.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/extras/miniaudio_libopus.h b/extras/miniaudio_libopus.h index 93f4d7b2..2a86ac83 100644 --- a/extras/miniaudio_libopus.h +++ b/extras/miniaudio_libopus.h @@ -84,13 +84,13 @@ static ma_data_source_vtable g_ma_libopus_ds_vtable = #if !defined(MA_NO_LIBOPUS) -static int ma_libopus_of_callback__read(void* pUserData, void* pBufferOut, int bytesToRead) +static int ma_libopus_of_callback__read(void* pUserData, unsigned char* pBufferOut, int bytesToRead) { ma_libopus* pOpus = (ma_libopus*)pUserData; ma_result result; size_t bytesRead; - result = pOpus->onRead(pOpus->pReadSeekTellUserData, pBufferOut, bytesToRead, &bytesRead); + result = pOpus->onRead(pOpus->pReadSeekTellUserData, (void*)pBufferOut, bytesToRead, &bytesRead); if (result != MA_SUCCESS) { return -1; diff --git a/extras/miniaudio_libvorbis.h b/extras/miniaudio_libvorbis.h index 4f43c44e..e0c8b763 100644 --- a/extras/miniaudio_libvorbis.h +++ b/extras/miniaudio_libvorbis.h @@ -300,7 +300,7 @@ MA_API ma_result ma_libvorbis_read_pcm_frames(ma_libvorbis* pVorbis, void* pFram break; } else { /* Frames need to be interleaved. */ - ma_interleave_pcm_frames(format, channels, libvorbisResult, ppFramesF32, ma_offset_pcm_frames_ptr(pFramesOut, totalFramesRead, format, channels)); + ma_interleave_pcm_frames(format, channels, libvorbisResult, (const void**)ppFramesF32, ma_offset_pcm_frames_ptr(pFramesOut, totalFramesRead, format, channels)); totalFramesRead += libvorbisResult; if (libvorbisResult == 0) {