summaryrefslogtreecommitdiffstats
path: root/player/audio.c
diff options
context:
space:
mode:
authorMartin Herkt <lachs0r@srsfckn.biz>2014-01-06 18:39:49 +0100
committerMartin Herkt <lachs0r@srsfckn.biz>2014-01-06 18:40:31 +0100
commitcd53de958da9708530b8bac3711a4c5d418fe95f (patch)
tree26abc3bd2338ed9d7d7446898eec513ad9ad94ad /player/audio.c
parent936a204e27e6aad4a7689c2543bcbd24a5fc958c (diff)
downloadmpv-cd53de958da9708530b8bac3711a4c5d418fe95f.tar.bz2
mpv-cd53de958da9708530b8bac3711a4c5d418fe95f.tar.xz
Fix audio delay inversion
Diffstat (limited to 'player/audio.c')
-rw-r--r--player/audio.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/player/audio.c b/player/audio.c
index 79d064940b..de08f6fce3 100644
--- a/player/audio.c
+++ b/player/audio.c
@@ -306,7 +306,7 @@ static int audio_start_sync(struct MPContext *mpctx, int playsize)
ptsdiff = written_pts - mpctx->hrseek_pts;
else
ptsdiff = written_pts - mpctx->video_next_pts - mpctx->delay
- - mpctx->audio_delay;
+ + mpctx->audio_delay;
samples = ptsdiff * real_samplerate;
// ogg demuxers give packets without timing
@@ -410,7 +410,7 @@ int fill_audio_out_buffers(struct MPContext *mpctx, double endpts)
}
if (endpts != MP_NOPTS_VALUE) {
- double samples = (endpts - written_audio_pts(mpctx) + mpctx->audio_delay)
+ double samples = (endpts - written_audio_pts(mpctx) - mpctx->audio_delay)
* ao->samplerate / opts->playback_speed;
if (playsize > samples) {
playsize = MPMAX(samples, 0);