From 9b654fd540d83cc637270326bb13dfe78f97a376 Mon Sep 17 00:00:00 2001 From: wm4 Date: Sun, 13 Jul 2014 20:07:29 +0200 Subject: player: remove some inactive code demux_seek() actually doesn't return seek success. Instead, it fails if the demuxer is flagged as unseekable (but this is checked explicitly at the beginning of this function), or if the seek target PTS is MP_NOPTS_VALUE (which can never happen). --- player/playloop.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/player/playloop.c b/player/playloop.c index 56b236d932..7e9b63995b 100644 --- a/player/playloop.c +++ b/player/playloop.c @@ -276,14 +276,7 @@ static int mp_seek(MPContext *mpctx, struct seek_params seek, if (hr_seek) demuxer_amount -= hr_seek_offset; - int seekresult = demux_seek(mpctx->demuxer, demuxer_amount, demuxer_style); - if (seekresult == 0) { - if (need_reset) { - reinit_audio_chain(mpctx); - seek_reset(mpctx, !timeline_fallthrough, false); - } - return -1; - } + demux_seek(mpctx->demuxer, demuxer_amount, demuxer_style); // Seek external, extra files too: for (int t = 0; t < mpctx->num_tracks; t++) { -- cgit v1.2.3