[MPlayer-cvslog] CVS: main mplayer.c,1.898,1.899

[Jindrich Makovicka CVS]

CVS change done by Jindrich Makovicka CVS

Update of /cvsroot/mplayer/main
In directory mail:/var2/tmp/cvs-serv15463

Modified Files:
	mplayer.c 
Log Message:
check the intermediate audio buffer

otherwise, data can get stuck between the demuxer and filter layer
causing a premature end of audio.


Index: mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/main/mplayer.c,v
retrieving revision 1.898
retrieving revision 1.899
diff -u -r1.898 -r1.899
--- mplayer.c	29 Dec 2005 11:27:22 -0000	1.898
+++ mplayer.c	31 Dec 2005 07:37:37 -0000	1.899
@@ -2599,7 +2599,7 @@
   current_module="decode_audio";   // Enter AUDIO decoder module
   t=GetTimer();
   while(sh_audio->a_out_buffer_len<playsize &&
-        (!d_audio->eof || sh_audio->a_in_buffer_len > 0)){
+        (!d_audio->eof || sh_audio->a_in_buffer_len > 0 || sh_audio->a_buffer_len > 0)){
     int ret=decode_audio(sh_audio,&sh_audio->a_out_buffer[sh_audio->a_out_buffer_len],
         playsize-sh_audio->a_out_buffer_len,sh_audio->a_out_buffer_size-sh_audio->a_out_buffer_len);
     if(ret<=0) { // EOF?