summaryrefslogtreecommitdiffstats
path: root/demux/demux_lavf.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_lavf.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_lavf.c')
-rw-r--r--demux/demux_lavf.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/demux/demux_lavf.c b/demux/demux_lavf.c
index e80db5aed4..117dcd48ed 100644
--- a/demux/demux_lavf.c
+++ b/demux/demux_lavf.c
@@ -857,12 +857,12 @@ static void demux_seek_lavf(demuxer_t *demuxer, float rel_seek_secs, int flags)
avsflags = AVSEEK_FLAG_BACKWARD;
if (flags & SEEK_FACTOR) {
- if (demuxer->movi_end > 0 && demuxer->ts_resets_possible &&
+ struct stream *s = demuxer->stream;
+ if (s->end_pos > 0 && demuxer->ts_resets_possible &&
!(priv->avif->flags & AVFMT_NO_BYTE_SEEK))
{
avsflags |= AVSEEK_FLAG_BYTE;
- priv->last_pts = (demuxer->movi_end - demuxer->movi_start) *
- rel_seek_secs;
+ priv->last_pts = (s->end_pos - s->start_pos) * rel_seek_secs;
} else if (priv->avfc->duration != 0 &&
priv->avfc->duration != AV_NOPTS_VALUE)
{
@@ -923,12 +923,12 @@ static int demux_lavf_control(demuxer_t *demuxer, int cmd, void *arg)
switch (cmd) {
case DEMUXER_CTRL_GET_TIME_LENGTH:
if (priv->seek_by_bytes) {
+ struct stream *s = demuxer->stream;
/* Our bitrate estimate may be better than would be used in
* otherwise similar fallback code at higher level */
- if (demuxer->movi_end <= 0)
+ if (s->end_pos <= 0)
return DEMUXER_CTRL_DONTKNOW;
- *(double *)arg = (demuxer->movi_end - demuxer->movi_start) * 8 /
- priv->bitrate;
+ *(double *)arg = (s->end_pos - s->start_pos) * 8 / priv->bitrate;
return DEMUXER_CTRL_GUESS;
}
if (priv->avfc->duration == 0 || priv->avfc->duration == AV_NOPTS_VALUE)