diff options
| author | wm4 <wm4@mplayer2.org> | 2012-04-01 22:52:33 +0200 |
|---|---|---|
| committer | wm4 <wm4@mplayer2.org> | 2012-04-01 22:52:33 +0200 |
| commit | 1aa2e36122e6e664e42170f47d6db82873bef5aa (patch) | |
| tree | 39e13f93bcb606da9e365c7cd379132bdf53c20b /libmpcodecs/vf_ass.c | |
| parent | fea8c85c8595b797fc839b113c1db252fc55c798 (diff) | |
| parent | 8cd71527ade21ea27ea24cdcc66dc71dca460f85 (diff) | |
| download | mpv-1aa2e36122e6e664e42170f47d6db82873bef5aa.tar.bz2 mpv-1aa2e36122e6e664e42170f47d6db82873bef5aa.tar.xz | |
Merge remote-tracking branch 'origin/master'
Conflicts:
bstr.c
bstr.h
etc/input.conf
input/input.c
input/input.h
libao2/ao_pulse.c
libmpcodecs/vf_ass.c
libmpcodecs/vf_vo.c
libvo/gl_common.c
libvo/x11_common.c
mixer.c
mixer.h
mplayer.c
Diffstat (limited to 'libmpcodecs/vf_ass.c')
| -rw-r--r-- | libmpcodecs/vf_ass.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libmpcodecs/vf_ass.c b/libmpcodecs/vf_ass.c index ce80caa74b..4dcddb1d08 100644 --- a/libmpcodecs/vf_ass.c +++ b/libmpcodecs/vf_ass.c @@ -370,7 +370,7 @@ static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts) mp_ass_reload_options(vf->priv->renderer, vf->opts); osd->ass_force_reload = false; images = ass_render_frame(vf->priv->renderer, osd->ass_track, - (pts + sub_delay) * 1000 + .5, NULL); + (pts - osd->sub_offset + sub_delay) * 1000 + .5, NULL); } prepare_image(vf, mpi); |