diff options
| author | Martin Herkt <lachs0r@srsfckn.biz> | 2016-02-28 23:31:51 +0100 |
|---|---|---|
| committer | Martin Herkt <lachs0r@srsfckn.biz> | 2016-02-28 23:31:51 +0100 |
| commit | 21cd4ff05bb46b375a9ad38c9f0b7f8e71a5d979 (patch) | |
| tree | b9679cc1d2c7c3cab0f88c370015f34f6d0b27ca /sub/ass_mp.h | |
| parent | d1d6257731866934717353fce484f5f472f845d1 (diff) | |
| parent | 1f436f65f2ee4df6419ca68bd6426b8283db6d22 (diff) | |
| download | mpv-21cd4ff05bb46b375a9ad38c9f0b7f8e71a5d979.tar.bz2 mpv-21cd4ff05bb46b375a9ad38c9f0b7f8e71a5d979.tar.xz | |
Merge branch 'master' into release/current
Diffstat (limited to 'sub/ass_mp.h')
| -rw-r--r-- | sub/ass_mp.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sub/ass_mp.h b/sub/ass_mp.h index 98311824ab..789a53acb1 100644 --- a/sub/ass_mp.h +++ b/sub/ass_mp.h @@ -44,6 +44,7 @@ struct mpv_global; struct mp_osd_res; struct osd_style_opts; +void mp_ass_flush_old_events(ASS_Track *track, long long ts); void mp_ass_set_style(ASS_Style *style, double res_y, const struct osd_style_opts *opts); |