Index: libmpdemux/demux_real.c
===================================================================
--- libmpdemux/demux_real.c     (revision 19958)
+++ libmpdemux/demux_real.c     (working copy)
@@ -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 +1082,7 @@
 discard:
     stream_skip(demuxer->stream, len);
   }//    goto loop;
+  return 0;
 }
 
 extern void print_wave_header(WAVEFORMATEX *h, int verbose_level);