From 8d40b1e8ab2eeefae7a3bc20e176b2be707d3682 Mon Sep 17 00:00:00 2001 From: wm4 Date: Sat, 5 Jul 2014 16:54:49 +0200 Subject: demux: make start time a simple field Simpler, especially for later changes. --- demux/demux_lavf.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'demux/demux_lavf.c') diff --git a/demux/demux_lavf.c b/demux/demux_lavf.c index 76a7d50471..619f06b32b 100644 --- a/demux/demux_lavf.c +++ b/demux/demux_lavf.c @@ -759,6 +759,13 @@ static int demux_open_lavf(demuxer_t *demuxer, enum demux_check check) demuxer->ts_resets_possible = priv->avif->flags & AVFMT_TS_DISCONT; + demuxer->start_time = priv->avfc->start_time == AV_NOPTS_VALUE ? + 0 : (double)priv->avfc->start_time / AV_TIME_BASE; + + double time; + if (stream_control(demuxer->stream, STREAM_CTRL_GET_START_TIME, &time) > 0) + demuxer->start_time = time; + return 0; } @@ -913,11 +920,6 @@ static int demux_lavf_control(demuxer_t *demuxer, int cmd, void *arg) *((double *)arg) = (double)priv->avfc->duration / AV_TIME_BASE; return DEMUXER_CTRL_OK; - case DEMUXER_CTRL_GET_START_TIME: - *((double *)arg) = priv->avfc->start_time == AV_NOPTS_VALUE ? - 0 : (double)priv->avfc->start_time / AV_TIME_BASE; - return DEMUXER_CTRL_OK; - case DEMUXER_CTRL_SWITCHED_TRACKS: { select_tracks(demuxer, 0); -- cgit v1.2.3