diff options
author | wm4 <wm4@nowhere> | 2014-07-13 20:07:29 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2014-07-13 20:07:29 +0200 |
commit | 9b654fd540d83cc637270326bb13dfe78f97a376 (patch) | |
tree | 6897e56d2839e64fb29f2eb721719d90b3ea4c40 /player/playloop.c | |
parent | ae7228c6a363a54249cc754089e12c2042811216 (diff) | |
download | mpv-9b654fd540d83cc637270326bb13dfe78f97a376.tar.bz2 mpv-9b654fd540d83cc637270326bb13dfe78f97a376.tar.xz |
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).
Diffstat (limited to 'player/playloop.c')
-rw-r--r-- | player/playloop.c | 9 |
1 files changed, 1 insertions, 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++) { |