Merge branch 'dev' into dev-0.11

extras/miniaudio_libopus.h

@@ -82,13 +82,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;

extras/miniaudio_libvorbis.h

@@ -313,7 +313,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) {