From 08dbaf1dcc43b5075976c35a2cc7060ef92e5f79 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Thu, 25 Feb 2016 22:49:50 +0100
Subject: demux_timeline: slightly improve reported file format

Report the underlying demuxer's format. Since there can be many demuxers
participating, pick the "main" segment.
---
 demux/demux_timeline.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'demux/demux_timeline.c')

diff --git a/demux/demux_timeline.c b/demux/demux_timeline.c
index 07fe4d102a..9fba3d5abb 100644
--- a/demux/demux_timeline.c
+++ b/demux/demux_timeline.c
@@ -358,6 +358,8 @@ static int d_open(struct demuxer *demuxer, enum demux_check check)
     demuxer->seekable = true;
     demuxer->partially_seekable = true;
 
+    demuxer->filetype = meta->filetype ? meta->filetype : meta->desc->name;
+
     reselect_streams(demuxer);
 
     return 0;
@@ -389,7 +391,7 @@ static int d_control(struct demuxer *demuxer, int cmd, void *arg)
 
 const demuxer_desc_t demuxer_desc_timeline = {
     .name = "timeline",
-    .desc = "timeline segment merging wrapper",
+    .desc = "timeline segments",
     .fill_buffer = d_fill_buffer,
     .open = d_open,
     .close = d_close,
-- 
cgit v1.2.3