summaryrefslogtreecommitdiffstats
path: root/mplayer.c
diff options
context:
space:
mode:
authoraurel <aurel@b3059339-0415-0410-9bf9-f77b7e298cf2>2010-05-31 19:10:57 +0000
committeraurel <aurel@b3059339-0415-0410-9bf9-f77b7e298cf2>2010-05-31 19:10:57 +0000
commite123aecb4825db7da60e67eae3a01d9222593d95 (patch)
treefb749ecf477b0c21500210a9a84b10d79c2e131b /mplayer.c
parentc071c9e805e6180e40df15f7d5e4028982789596 (diff)
downloadmpv-e123aecb4825db7da60e67eae3a01d9222593d95.tar.bz2
mpv-e123aecb4825db7da60e67eae3a01d9222593d95.tar.xz
backport ass_flush_events() from upstream libass and make use of it
This fixes subtitles duplication when seeking back in ass stream formated with the "standard" format FFmpeg uses. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31293 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'mplayer.c')
-rw-r--r--mplayer.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/mplayer.c b/mplayer.c
index 98d36586ee..1c56ba3c19 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -2581,6 +2581,11 @@ static int seek(MPContext *mpctx, double amount, int style)
vobsub_seek(vo_vobsub, mpctx->sh_video->pts);
}
+#ifdef CONFIG_ASS
+ if (ass_enabled && mpctx->d_sub->sh && ((sh_sub_t *)mpctx->d_sub->sh)->ass_track)
+ ass_flush_events(((sh_sub_t *)mpctx->d_sub->sh)->ass_track);
+#endif
+
edl_seek_reset(mpctx);
c_total = 0;