summaryrefslogtreecommitdiffstats
path: root/demux/demux_mkv.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-11-03 18:50:00 +0100
committerwm4 <wm4@nowhere>2013-11-03 18:50:00 +0100
commit847cbe9d5d03c77491f3139dde6e163426283ccb (patch)
tree76acc956c53b97410b366c2f6f10a9eb0561a621 /demux/demux_mkv.c
parent22274f7982e01784a27daac371fe2a1607433425 (diff)
downloadmpv-847cbe9d5d03c77491f3139dde6e163426283ccb.tar.bz2
mpv-847cbe9d5d03c77491f3139dde6e163426283ccb.tar.xz
demux: remove movi_start/movi_end fields
Pointless, using stream->start_pos/end_pos instead. demux_mf was the only place where this was used specially, but we can rely on timestamps instead for this case.
Diffstat (limited to 'demux/demux_mkv.c')
-rw-r--r--demux/demux_mkv.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/demux/demux_mkv.c b/demux/demux_mkv.c
index b26cba5a29..d6948e9979 100644
--- a/demux/demux_mkv.c
+++ b/demux/demux_mkv.c
@@ -1029,7 +1029,7 @@ static int demux_mkv_read_seekhead(demuxer_t *demuxer)
continue;
}
uint64_t pos = seek->seek_position + mkv_d->segment_start;
- if (pos >= demuxer->movi_end) {
+ if (pos >= s->end_pos) {
mp_msg(MSGT_DEMUX, MSGL_WARN, "[mkv] SeekHead position beyond "
"end of file - incomplete file?\n");
continue;
@@ -1847,8 +1847,6 @@ static int demux_mkv_open(demuxer_t *demuxer, enum demux_check check)
if (s->end_pos == 0) {
demuxer->seekable = 0;
} else {
- demuxer->movi_start = s->start_pos;
- demuxer->movi_end = s->end_pos;
demuxer->seekable = 1;
}
@@ -2713,7 +2711,7 @@ static void demux_mkv_seek(demuxer_t *demuxer, float rel_seek_secs, int flags)
}
demux_mkv_fill_buffer(demuxer);
- } else if ((demuxer->movi_end <= 0) || !(flags & SEEK_ABSOLUTE))
+ } else if (!(flags & SEEK_ABSOLUTE))
mp_msg(MSGT_DEMUX, MSGL_V, "[mkv] seek unsupported flags\n");
else {
stream_t *s = demuxer->stream;
@@ -2729,7 +2727,7 @@ static void demux_mkv_seek(demuxer_t *demuxer, float rel_seek_secs, int flags)
return;
}
- target_filepos = (uint64_t) (demuxer->movi_end * rel_seek_secs);
+ target_filepos = (uint64_t) (s->end_pos * rel_seek_secs);
for (i = 0; i < mkv_d->num_indexes; i++)
if (mkv_d->indexes[i].tnum == v_tnum)
if ((index == NULL)