100l, av_fifo_generic_read does not return anything useful, so ignore its

return value and return len instead.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29481 b3059339-0415-0410-9bf9-f77b7e298cf2

2 files changed, 5 insertions, 3 deletions

diff --git a/libao2/ao_coreaudio.c b/libao2/ao_coreaudio.c
index ad17773fbd..130eee8f97 100644
--- a/libao2/ao_coreaudio.c
+++ b/libao2/ao_coreaudio.c
@@ -115,7 +115,8 @@ static int write_buffer(unsigned char* data, int len){
 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 --git a/libao2/ao_sdl.c b/libao2/ao_sdl.c
index aae6e3fc7d..329486b272 100644
--- a/libao2/ao_sdl.c
+++ b/libao2/ao_sdl.c
@@ -82,10 +82,11 @@ static int read_buffer(unsigned char* data,int len){
   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