summaryrefslogtreecommitdiffstats
path: root/player
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2014-11-27 18:52:22 +0100
committerwm4 <wm4@nowhere>2014-11-27 18:52:22 +0100
commita3026c96408ec640e18dfafe06710919ceb89494 (patch)
treec87c5989f67dc6390c3d3f650da916cc198ac459 /player
parent0ed77ca7e2445dd13a4ddfb9523774bbeecc7a81 (diff)
downloadmpv-a3026c96408ec640e18dfafe06710919ceb89494.tar.bz2
mpv-a3026c96408ec640e18dfafe06710919ceb89494.tar.xz
audio: alternative fix for previous commit
This is a somewhat obscure situation, and happens only if audio starts again after it has ended (in particular can happens with files where audio starts later). It doesn't matter much whether audio starts immediately or some milliseconds later, so simplify it.
Diffstat (limited to 'player')
-rw-r--r--player/audio.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/player/audio.c b/player/audio.c
index a1e1182e8a..dc1d305525 100644
--- a/player/audio.c
+++ b/player/audio.c
@@ -514,10 +514,7 @@ static void do_fill_audio_out_buffers(struct MPContext *mpctx, double endpts)
// restart audio properly. This helps with video files where audio starts
// later. Retrying is needed to get the correct sync PTS.
if (mpctx->audio_status >= STATUS_DRAINING && status == AD_OK) {
- if (!mpctx->paused) {
- mpctx->audio_status = STATUS_SYNCING;
- mpctx->sleeptime = 0;
- }
+ mpctx->audio_status = STATUS_SYNCING;
return; // retry on next iteration
}