[MPlayer-cvslog] r19966 - trunk/libmpdemux/demux_real.c

[reimar]

Author: reimar
Date: Sun Sep 24 16:26:31 2006
New Revision: 19966

Modified:
   trunk/libmpdemux/demux_real.c

Log:
Make fill_buffer function check for stream eof, fixes hang at eof (bug #580)


Modified: trunk/libmpdemux/demux_real.c
==============================================================================
--- trunk/libmpdemux/demux_real.c	(original)
+++ trunk/libmpdemux/demux_real.c	Sun Sep 24 16:26:31 2006
@@ -569,7 +569,7 @@
     int x, sps, cfs, sph, spc, w;
     int audioreorder_getnextpk = 0;
 
-  while(1){
+  while(!stream_eof(demuxer->stream)){
 
     /* Handle audio/video demxing switch for multirate files (non-interleaved) */
     if (priv->is_multirate && priv->stream_switch) {
@@ -1075,6 +1075,7 @@
 discard:
     stream_skip(demuxer->stream, len);
   }//    goto loop;
+  return 0;
 }
 
 extern void print_wave_header(WAVEFORMATEX *h, int verbose_level);