[MPlayer-cvslog] r37261 - trunk/mplayer.c

[reimar]

Author: reimar
Date: Sun Aug 31 11:33:38 2014
New Revision: 37261

Log:
Double-check that we are really at audio EOF by trying to refill.

Somewhat improves trac #2196.

Modified:
   trunk/mplayer.c

Modified: trunk/mplayer.c
==============================================================================
--- trunk/mplayer.c	Sun Aug 31 00:06:22 2014	(r37260)
+++ trunk/mplayer.c	Sun Aug 31 11:33:38 2014	(r37261)
@@ -3823,7 +3823,7 @@ goto_enable_cache:
                         // Ensure vo_pts is updated so that ao_pcm will not hang.
                         advance_timer(frame_time);
                         // only stop playing when audio is at end as well
-                        if (!mpctx->sh_audio || mpctx->d_audio->eof)
+                        if (!mpctx->sh_audio || (mpctx->d_audio->eof && !ds_fill_buffer(mpctx->d_audio)))
                             mpctx->eof = 1;
                     } else {
                         // might return with !eof && !blit_frame if !correct_pts