diff options
author | wm4 <wm4@nowhere> | 2015-11-16 23:15:59 +0100 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2015-11-16 23:17:33 +0100 |
commit | 85450d06a1b1a08fce277f7f14d5ee33b12f8eab (patch) | |
tree | ce03648a54db276113bbf5d29ce78a3e4c265460 /sub/osd.c | |
parent | 70df1608d6f74f3eba9a5e593822984194f63951 (diff) | |
download | mpv-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 'sub/osd.c')
-rw-r--r-- | sub/osd.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -247,7 +247,7 @@ static void render_object(struct osd_state *osd, struct osd_object *obj, if (sub->render_bitmap_subs && sub->dec_sub) { double sub_pts = video_pts; if (sub_pts != MP_NOPTS_VALUE) - sub_pts -= sub->video_offset + opts->sub_delay; + sub_pts -= opts->sub_delay; sub_get_bitmaps(sub->dec_sub, obj->vo_res, sub_pts, out_imgs); } else { osd_object_get_bitmaps(osd, obj, out_imgs); |