summaryrefslogtreecommitdiffstats
path: root/player/audio.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2015-11-16 23:15:59 +0100
committerwm4 <wm4@nowhere>2015-11-16 23:17:33 +0100
commit85450d06a1b1a08fce277f7f14d5ee33b12f8eab (patch)
treece03648a54db276113bbf5d29ce78a3e4c265460 /player/audio.c
parent70df1608d6f74f3eba9a5e593822984194f63951 (diff)
downloadmpv-85450d06a1b1a08fce277f7f14d5ee33b12f8eab.tar.bz2
mpv-85450d06a1b1a08fce277f7f14d5ee33b12f8eab.tar.xz
player: use demuxer ts offset to simplify timeline ts handling
Use the demux_set_ts_offset() added in the previous commit to base each timeline segment to use timestamps according to its relative position within the overall timeline. As a consequence we don't need to care about these timestamps anymore, and everything becomes simpler. (Another minor but delicious nugget of sanity.)
Diffstat (limited to 'player/audio.c')
-rw-r--r--player/audio.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/player/audio.c b/player/audio.c
index c4483a227e..96345366fd 100644
--- a/player/audio.c
+++ b/player/audio.c
@@ -384,8 +384,7 @@ double written_audio_pts(struct MPContext *mpctx)
// to get the length in original units without speedup or slowdown
a_pts -= buffered_output * mpctx->audio_speed;
- return a_pts +
- get_track_video_offset(mpctx, mpctx->current_track[0][STREAM_AUDIO]);
+ return a_pts;
}
// Return pts value corresponding to currently playing audio.