summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2014-11-27 18:52:22 +0100
committerAlessandro Ghedini <alessandro@ghedini.me>2014-11-28 15:51:03 +0100
commitbc1370041ddfea92c435db148ecf4e91bc85000b (patch)
tree97a320396338ceec8867294c74c7f41c167bdccf
parent4f74869cd86f711f19a7537f5e599ec8aeccc9c2 (diff)
downloadmpv-bc1370041ddfea92c435db148ecf4e91bc85000b.tar.bz2
mpv-bc1370041ddfea92c435db148ecf4e91bc85000b.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.
-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
}