demux: make start time a simple field

Simpler, especially for later changes.

1 files changed, 7 insertions, 5 deletions

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);