# HG changeset patch # User reimar # Date 1249719455 0 # Node ID 02dec439f7172351835a7592d5023f68efd7277a # Parent 0b61e12a6ca235574f0081c0c1360b7a16ee1fc8 100l, av_fifo_generic_read does not return anything useful, so ignore its return value and return len instead. diff -r 0b61e12a6ca2 -r 02dec439f717 libao2/ao_coreaudio.c --- a/libao2/ao_coreaudio.c Fri Aug 07 09:07:02 2009 +0000 +++ b/libao2/ao_coreaudio.c Sat Aug 08 08:17:35 2009 +0000 @@ -115,7 +115,8 @@ static int read_buffer(unsigned char* data,int len){ int buffered = av_fifo_size(ao->buffer); if (len > buffered) len = buffered; - return av_fifo_generic_read(ao->buffer, data, len, NULL); + av_fifo_generic_read(ao->buffer, data, len, NULL); + return len; } OSStatus theRenderProc(void *inRefCon, AudioUnitRenderActionFlags *inActionFlags, const AudioTimeStamp *inTimeStamp, UInt32 inBusNumber, UInt32 inNumFrames, AudioBufferList *ioData) diff -r 0b61e12a6ca2 -r 02dec439f717 libao2/ao_sdl.c --- a/libao2/ao_sdl.c Fri Aug 07 09:07:02 2009 +0000 +++ b/libao2/ao_sdl.c Sat Aug 08 08:17:35 2009 +0000 @@ -82,10 +82,11 @@ int buffered = av_fifo_size(buffer); if (len > buffered) len = buffered; #ifdef USE_SDL_INTERNAL_MIXER - return av_fifo_generic_read(buffer, data, len, mix_audio); + av_fifo_generic_read(buffer, data, len, mix_audio); #else - return av_fifo_generic_read(buffer, data, len, NULL); + av_fifo_generic_read(buffer, data, len, NULL); #endif + return len; } // end ring buffer stuff