Mercurial > mplayer.hg
changeset 29439:02dec439f717
100l, av_fifo_generic_read does not return anything useful, so ignore its
return value and return len instead.
| author | reimar |
|---|---|
| date | Sat, 08 Aug 2009 08:17:35 +0000 |
| parents | 0b61e12a6ca2 |
| children | 0673fad0546f |
| files | libao2/ao_coreaudio.c libao2/ao_sdl.c |
| diffstat | 2 files changed, 5 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- 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)
--- 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