Merge branch 'master' into release/current

1 files changed, 4 insertions, 0 deletions

diff --git a/demux/timeline.h b/demux/timeline.h
index edc6a2f7ae..21a6602ba8 100644
--- a/demux/timeline.h
+++ b/demux/timeline.h
@@ -4,6 +4,7 @@
 struct timeline_part {
     double start;
     double source_start;
+    char *url;
     struct demuxer *source;
 };
 
@@ -15,6 +16,9 @@ struct timeline {
     // main source
     struct demuxer *demuxer;
 
+    bstr init_fragment;
+    bool dash;
+
     // All referenced files. The source file must be at sources[0].
     struct demuxer **sources;
     int num_sources;