diff options
| author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2009-11-11 11:31:36 +0000 |
|---|---|---|
| committer | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2009-11-11 11:31:36 +0000 |
| commit | 376aa9416fa6e1d6244e0a821b45282875e73afb (patch) | |
| tree | 3ddd60e9c7a3edeef2a106f0539cae9c06045f35 /mplayer.c | |
| parent | 254b4855b1002f5f3d0912622bdccb8a771baa4f (diff) | |
| download | mpv-376aa9416fa6e1d6244e0a821b45282875e73afb.tar.bz2 mpv-376aa9416fa6e1d6244e0a821b45282875e73afb.tar.xz | |
Do not call resume on unpausing if we have already reached eof while
being paused (e.g. because of a "pausing_keep_force pt_step 1").
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29898 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'mplayer.c')
| -rw-r--r-- | mplayer.c | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -2443,6 +2443,9 @@ static void pause_loop(void) } mpctx->osd_function=OSD_PLAY; if (mpctx->audio_out && mpctx->sh_audio) + if (mpctx->eof) // do not play remaining audio if we e.g. switch to the next file + mpctx->audio_out->reset(); + else mpctx->audio_out->resume(); // resume audio if (mpctx->video_out && mpctx->sh_video && vo_config_count) mpctx->video_out->control(VOCTRL_RESUME, NULL); // resume video |