RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

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
This commit is contained in:
reimar 2009-08-08 08:17:35 +00:00
parent a04ec2484b
commit 3b6b050e14
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libao2/ao_coreaudio.c
View File

@ -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)

5
libao2/ao_sdl.c
View File

@ -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