summaryrefslogtreecommitdiffstats
path: root/mplayer.c
diff options
context:
space:
mode:
authorreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2010-01-24 15:16:39 +0000
committerreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2010-01-24 15:16:39 +0000
commit71dcc053fe61841201abe1034a86eae863197c48 (patch)
tree295ae2ca646e5bfa6b4f42edc68e15645b6eb214 /mplayer.c
parent213092c8dcfc925d8d54cf320b60cf298a870696 (diff)
downloadmpv-71dcc053fe61841201abe1034a86eae863197c48.tar.bz2
mpv-71dcc053fe61841201abe1034a86eae863197c48.tar.xz
Move the resync-related code into more consistent places instead of having it
scattered all over the place with half of it forgotten in some places. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30420 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'mplayer.c')
-rw-r--r--mplayer.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/mplayer.c b/mplayer.c
index 1eacaaf085..1344fecda5 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -2543,12 +2543,8 @@ static int seek(MPContext *mpctx, double amount, int style)
mpctx->startup_decode_retry = DEFAULT_STARTUP_DECODE_RETRY;
if (mpctx->sh_video) {
current_module = "seek_video_reset";
- resync_video_stream(mpctx->sh_video);
if (vo_config_count)
mpctx->video_out->control(VOCTRL_RESET, NULL);
- mpctx->sh_video->next_frame_time = 0;
- mpctx->sh_video->num_buffered_pts = 0;
- mpctx->sh_video->last_pts = MP_NOPTS_VALUE;
mpctx->num_buffered_frames = 0;
mpctx->delay = 0;
mpctx->time_frame = 0;
@@ -2563,8 +2559,6 @@ static int seek(MPContext *mpctx, double amount, int style)
if (mpctx->sh_audio) {
current_module = "seek_audio_reset";
mpctx->audio_out->reset(); // stop audio, throwing away buffered data
- mpctx->sh_audio->a_buffer_len = 0;
- mpctx->sh_audio->a_out_buffer_len = 0;
if (!mpctx->sh_video)
update_subtitles(NULL, mpctx->sh_audio->pts, mpctx->d_sub, 1);
}