diff options
| author | ods15 <ods15@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-11-18 20:44:22 +0000 |
|---|---|---|
| committer | ods15 <ods15@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-11-18 20:44:22 +0000 |
| commit | 7a06410d1882c465ae872e19d9179d02d49d7a09 (patch) | |
| tree | b86f6c80fc25bf3c24ec1fb97013f3cebd304418 /libmpdemux/demux_nut.c | |
| parent | 75c1fd9c1d8f41800a00b572634b1475fa2c721b (diff) | |
| download | mpv-7a06410d1882c465ae872e19d9179d02d49d7a09.tar.bz2 mpv-7a06410d1882c465ae872e19d9179d02d49d7a09.tar.xz | |
fix demux_nut to give proper (estimate) of percent position after a seek
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21039 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux/demux_nut.c')
| -rw-r--r-- | libmpdemux/demux_nut.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libmpdemux/demux_nut.c b/libmpdemux/demux_nut.c index 4668aec0c9..0c17401112 100644 --- a/libmpdemux/demux_nut.c +++ b/libmpdemux/demux_nut.c @@ -260,8 +260,10 @@ static void demux_seek_nut(demuxer_t * demuxer, float time_pos, float audio_dela priv->s[0].time_base.den; while ((ret = nut_seek(nut, time_pos, nutflags, tmp)) == NUT_ERR_EAGAIN); + priv->last_pts = -1; if (ret) mp_msg(MSGT_HEADER, MSGL_ERR, "NUT error: %s\n", nut_error(ret)); if (sh_audio) resync_audio_stream(sh_audio); + demuxer->filepos = stream_tell(demuxer->stream); } static int demux_control_nut(demuxer_t * demuxer, int cmd, void * arg) { @@ -273,7 +275,7 @@ static int demux_control_nut(demuxer_t * demuxer, int cmd, void * arg) { priv->s[0].time_base.den; return DEMUXER_CTRL_OK; case DEMUXER_CTRL_GET_PERCENT_POS: - if (priv->s[0].max_pts == 0) + if (priv->s[0].max_pts == 0 || priv->last_pts == -1) return DEMUXER_CTRL_DONTKNOW; *((int *)arg) = priv->last_pts * 100 / (double)priv->s[0].max_pts; |